summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-06-25 13:30:46 +0000
committerKarl Berry <karl@freefriends.org>2022-06-25 13:30:46 +0000
commit19c09132cfbe94c0ad43ae990668a5907f63d7bc (patch)
treecaf93d64714ae68815f4b46ccb9a78d6cebb0826
parent378715c0061142037d81c4b85706bb6f841a1264 (diff)
biblatex-apa
git-svn-id: svn://tug.org/texlive/trunk@63719 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib34
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib193
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin223948 -> 225032 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex18
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin66825 -> 67413 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx251
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx40
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx357
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx174
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx81
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx357
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx357
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx357
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx69
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx357
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx68
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx77
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx76
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx69
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx172
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx69
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx358
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx360
37 files changed, 2955 insertions, 1752 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 0d6e5523037..7a5602951d3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -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 (© 2019).
+maintainer is Philip Kime (© 2022).
This package is a biblatex style for APA (American Psychological
Association) style compliant documents typeset in LaTeX. It
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 464e4da4a94..59045ece961 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
@@ -60,24 +60,24 @@
}
@BOOK{8.12d,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title1}
}
@BOOK{8.12e,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title1},
DATE = {2017}
}
@BOOK{8.12f,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title2},
DATE = {2017}
}
@BOOK{8.12g,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title1},
DATE = {2019}
}
@@ -169,7 +169,7 @@
% (APA 8.13)
@BOOK{8.13a,
- GROUPAUTHOR = {{Centers for Disease Control and Prevention}},
+ author = {{Centers for Disease Control and Prevention}},
TITLE = {Title},
DATE = {2019}
}
@@ -205,7 +205,7 @@
}
@BOOK{8.13g,
- GROUPAUTHOR = {{Beck Institute for Cognitive Behaviour Therapy}},
+ author = {{Beck Institute for Cognitive Behaviour Therapy}},
TITLE = {Title},
DATE = {2012}
}
@@ -284,14 +284,14 @@
}
@BOOK{8.17d,
- GROUPAUTHOR = {{National Institute of Mental Health}},
+ author = {{National Institute of Mental Health}},
SHORTAUTHOR = {NIMH},
TITLE = {Title},
DATE = {2020}
}
@BOOK{8.17e,
- GROUPAUTHOR = {{Stanford University}},
+ author = {{Stanford University}},
TITLE = {Title},
DATE = {2020}
}
@@ -309,7 +309,7 @@
}
@BOOK{8.17h,
- GROUPAUTHOR = {{American Educational Research Association} and {Some other group} and {Yet another group}},
+ author = {{American Educational Research Association} and {Some other group} and {Yet another group}},
TITLE = {Title},
DATE = {2014}
}
@@ -351,6 +351,18 @@
DATE = {1991}
}
+@BOOK{8.18g,
+ AUTHOR = {Author Red and Author Green and Author Black and Author Blue},
+ TITLE = {Title One},
+ DATE = {2022}
+}
+
+@BOOK{8.18h,
+ AUTHOR = {Author Red and Author Green and Author White and Author Blue},
+ TITLE = {Title Two},
+ DATE = {2022}
+}
+
% (APA 8.19)
@BOOK{8.19a,
AUTHOR = {A. Judge and B. Kammeyer-Mueller},
@@ -432,14 +444,14 @@
% (APA 8.21)
@BOOK{8.21a,
- GROUPAUTHOR = {{The American Psychological Association}},
+ author = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title1},
DATE = {2017}
}
@BOOK{8.21b,
- GROUPAUTHOR = {{The American Psychological Association}},
+ author = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title2},
DATE = {2006}
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 b91b1faae56..96a7863f54d 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
@@ -68,6 +68,25 @@
DATE = {2014}
}
+% Testing seasons
+@ARTICLE{9.14:1,
+ AUTHOR = {Arthur Test},
+ TITLE = {Test Title},
+ JOURNALTITLE = {Seasonal Journal},
+ VOLUME = {33},
+ NUMBER = {2},
+ DATE = {2012-22}
+}
+
+@ARTICLE{9.14:2,
+ AUTHOR = {Arthur Test},
+ TITLE = {Test Title 2},
+ JOURNALTITLE = {Seasonal Journal},
+ VOLUME = {34},
+ NUMBER = {3},
+ DATE = {2012-22/2012-23}
+}
+
% (APA 9.44)
@NAMEONLY{9.44:1a,
AUTHOR = {A. S. Benjamin}
@@ -1365,7 +1384,7 @@
% (APA 10.4 Example 53)
@REPORT{10.4:53,
- AUTHOR = {{British Cardiovascular Society Working Group}},
+ AUTHOR = {{British Cardiovascular Society Working Group}},
TITLE = {British {Cardiovascular} {Society} {Working} {Group} report},
SUBTITLE = {Out-of-hours Cardiovascular Care: {Management} of
Cardiac Emergencies and Hospital In-patients},
@@ -1376,7 +1395,7 @@
% (APA 10.4 Example 54)
@REPORT{10.4:54,
- AUTHOR = {{U.S. Securities and Exchange Commission}},
+ AUTHOR = {{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},
@@ -1385,14 +1404,14 @@
% (APA 10.4 Example 55)
@REPORT{10.4:55a,
- AUTHOR = {{American Counseling Association}},
+ AUTHOR = {{American Counseling Association}},
TITLE = {2014 {ACA} code of ethics},
URL = {https://www.counseling.org/knowledge-center},
DATE = {2014}
}
@REPORT{10.4:55b,
- AUTHOR = {{American Nurses Association}},
+ AUTHOR = {{American Nurses Association}},
TITLE = {Code of Ethics for Nurses with Interpretive Statements},
URL = {https://www.nursingworld.org/coe-view-only},
DATE = {2015}
@@ -1400,10 +1419,10 @@
@REPORT{10.4:55c,
AUTHOR = {{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}
+ TITLE = {Ethical Principles of Psychologists and Code of Conduct},
+ NOTE = {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)
@@ -1417,7 +1436,8 @@
AUTHOR+an:role = {1="Principal Investigator"},
TITLE = {Stress, Self-Regulation and Psychopathology in Middle Childhood},
TITLEADDON = {Grant},
- TYPE = {Project No. 5R01HD081252-04},
+ TYPE = {Project},
+ NUMBER = {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},
@@ -1525,7 +1545,7 @@
BOOKTITLE = {Proceedings of the National Academy of Sciences, USA},
VOLUME = {116},
NUMBER = {47},
- PAGES = {23499–-23504},
+ PAGES = {23499--23504},
DATE = {2019},
DOI = {10.1073/pnas.1910510116}
}
@@ -1558,35 +1578,35 @@
}
% (APA 10.6 Example 64)
-@THESIS{10.6:64,
+% Note the override of the auto-populated "phdthesis" type as this is a
+% non-standard, non-localised string type
+@PHDTHESIS{10.6:64,
AUTHOR = {L. Harris},
TITLE = {Instructional Leadership Perceptions and Practices of
Elementary School Leaders},
- TITLEADDON = {Unpublished Doctoral Dissertation},
+ TYPE = {Unpublished doctoral dissertation},
INSTITUTION = {University of Virginia},
DATE = {2014}
}
% (APA 10.6 Example 65)
-@THESIS{10.6:65,
+@PHDTHESIS{10.6:65,
AUTHOR = {M. M. Hollander},
TITLE = {Resistance to Authority},
- SUBTITLE = {Methodological Innovations and New Lessons from the
- {Milgram} Experiment},
- TITLEADDON = {Doctoral Dissertation, {University} of {Wisconsin}--{Madison}},
- PUBLISHER = {{ProQuest Dissertations and Theses Global}},
- TYPE = {Publication},
+ SUBTITLE = {Methodological Innovations and New Lessons from the {Milgram} Experiment},
+ INSTITUTION = {University of Wisconsin--Madison},
+ PUBLISHER = {ProQuest Dissertations {and} Theses Global},
NUMBER = {10289373},
DATE = {2017}
}
% (APA 10.6 Example 66)
-@THESIS{10.6:66,
+@MASTERSTHESIS{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, {The} {College} of {William} \& {Mary}},
+ INSTITUTION = {The College of William \& Mary},
PUBLISHER = {William \& Mary Digital Archive},
URL = {https://digitalarchive.wm.edu/bitstream/handle/10288/16594/HutchesonVirginia2012.pdf},
DATE = {2012}
@@ -1923,6 +1943,13 @@
% (APA 10.12 Example 86)
% ENTRYSUBTYPE is a localisation string
+% Note that if there were only one author, the annotation would be
+% "1=execproducer" to get the singular form and apply it only to the first
+% item in the name list, even though there is only one. List item
+% annotations (those of the form "n=<annotation>" should be the singular form
+% whereas whole field annotations (those of the form "=<annotation>" should usually
+% be the plural form. So, when using the singular form, a list item index
+% is mandatory.
@VIDEO{10.12:86,
ENTRYSUBTYPE = {tvseries},
AUTHOR = {D. Simon and R. F. Colesberry and Kostroff Noble, N.},
@@ -2264,28 +2291,28 @@
% (APA 10.15 Example 103)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:103a,
- ENTRYSUBTYPE = {Tweet},
+ ENTRYSUBTYPE = {Tweet},
AUTHOR = {{APA Education}},
AUTHOR+an:username = {1="@APAEducation"},
- TITLE = {College Students are Forming Mental-Health
+ TITLE = {College Students are Forming Mental-Health
Clubs--and They're Making a Difference @washingtonpost},
- TITLEADDON = {Thumbnail with link attached},
- EPRINT = {Twitter},
- DATE = {2018-06-29},
- URL = {https://twitter.com/apaeducation/status/1012810490530140161}
+ TITLEADDON = {Thumbnail with link attached},
+ EPRINT = {Twitter},
+ DATE = {2018-06-29},
+ URL = {https://twitter.com/apaeducation/status/1012810490530140161}
}
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:103b,
- ENTRYSUBTYPE = {Tweet},
+ ENTRYSUBTYPE = {Tweet},
AUTHOR = {{Badlands National Park}},
AUTHOR+an:username = {1="@BadlandsNPS"},
- TITLE = {Biologists Have Identified More Than 400
+ TITLE = {Biologists Have Identified More Than 400
Different Plant Species Growing in
{@BadlandsNPS} \#{DYK} \#biodoversity},
- EPRINT = {Twitter},
- DATE = {2018-02-26},
- URL = {https://twitter.com/BadlandsNPS/status/968196500412133379}
+ EPRINT = {Twitter},
+ DATE = {2018-02-26},
+ URL = {https://twitter.com/BadlandsNPS/status/968196500412133379}
}
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@@ -2303,104 +2330,104 @@
% (APA 10.15 Example 104)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:104,
- ENTRYSUBTYPE = {Twitter profile},
+ ENTRYSUBTYPE = {Twitter profile},
AUTHOR = {{APA Style}},
AUTHOR+an:username = {1="@APA\_Style"},
- TITLE = {Tweets},
- EPRINT = {Twitter},
- URL = {https://twitter.com/APA_Style},
- URLDATE = {2019-11-01}
+ TITLE = {Tweets},
+ EPRINT = {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
@ONLINE{10.15:105a,
- ENTRYSUBTYPE = {Status update},
- AUTHOR = {N. Gaiman},
- TITLE = {100,000+ {Rohingya} Refugees Could be at
+ ENTRYSUBTYPE = {Status update},
+ AUTHOR = {N. Gaiman},
+ TITLE = {100,000+ {Rohingya} Refugees Could be at
Serious Risk during {Bangladesh's} Monsoon
Season. {My} Fellow {UNHCR} {Goodwill}
{Ambassador} {Cate} {Blanchett} is},
- TITLEADDON = {Image attached},
- EPRINT = {Facebook},
- URL = {http://bit.ly/2JQxPAD},
- DATE = {2018-03-22}
+ TITLEADDON = {Image attached},
+ EPRINT = {Facebook},
+ URL = {http://bit.ly/2JQxPAD},
+ DATE = {2018-03-22}
}
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:105b,
- ENTRYSUBTYPE = {Infographic},
- AUTHOR = {{National Institute of Mental Health}},
- TITLE = {Suicide Affects all Ages, Genders, Races, and
+ ENTRYSUBTYPE = {Infographic},
+ AUTHOR = {{National Institute of Mental Health}},
+ TITLE = {Suicide Affects all Ages, Genders, Races, and
Ethnicities. {Check} out These 5 {Action}
{Steps} for {Helping} {Someone} in {Emotional}
{Pain}},
- EPRINT = {Facebook},
- URL = {http://bit.ly/321Qstq},
- DATE = {2018-11-28}
+ EPRINT = {Facebook},
+ URL = {http://bit.ly/321Qstq},
+ DATE = {2018-11-28}
}
% Note protecting of automatic sentence-casing in SUBTITLE for url
@ONLINE{10.15:105c,
- ENTRYSUBTYPE = {video},
- AUTHOR = {{News From Science}},
- TITLE = {These Frogs Walk Instead of Hop},
- SUBTITLE = {{h}ttps://scimag.2{K}lriw{H}},
- EPRINT = {Facebook},
- URL = {https://www.facebook.com/ScienceNOW/videos/10155508587605108},
- DATE = {2018-06-26}
+ ENTRYSUBTYPE = {video},
+ AUTHOR = {{News From Science}},
+ TITLE = {These Frogs Walk Instead of Hop},
+ SUBTITLE = {{h}ttps://scimag.2{K}lriw{H}},
+ EPRINT = {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
@ONLINE{10.15:106,
- ENTRYSUBTYPE = {Facebook page},
- AUTHOR = {{Smithsonian's National Zoo and Conservation
+ ENTRYSUBTYPE = {Facebook page},
+ AUTHOR = {{Smithsonian's National Zoo and Conservation
Biology Institute}},
- TITLE = {Home},
- EPRINT = {Facebook},
- URL = {https://www.facebookcom/nationalzoo},
- URLDATE = {2019-06-22}
+ TITLE = {Home},
+ EPRINT = {Facebook},
+ URL = {https://www.facebookcom/nationalzoo},
+ URLDATE = {2019-06-22}
}
% (APA 10.15 Example 107)
% ENTRYSUBTYPE is a localisation string
@ONLINE{10.15:107,
- ENTRYSUBTYPE = {photographs},
+ ENTRYSUBTYPE = {photographs},
AUTHOR = {{Zeitz MOCAA}},
AUTHOR+an:username = {1="@zeitzmocaa"},
- TITLE = {Grade 6 Learners from {Parkfields} {Primary}
- {School} in {Hanover} {Park} Visited the
- Museum for a Tour and Workshop Hosted by},
- EPRINT = {Instagram},
- URL = {https://www.instagram.com/p/BqpHpjFBs3b},
- DATE = {2018-11-26}
+ TITLE = {Grade 6 Learners from {Parkfields} {Primary}
+ {School} in {Hanover} {Park} Visited the
+ Museum for a Tour and Workshop Hosted by},
+ EPRINT = {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
@ONLINE{10.15:108,
- ENTRYSUBTYPE = {Highlight},
+ ENTRYSUBTYPE = {Highlight},
AUTHOR = {{The New York Public Library}},
AUTHOR+an:username = {1="@nypl"},
- TITLE = {The Raven},
- EPRINT = {Instagram},
- URL = {https://bitly.com/2FV8bu3},
- URLDATE = {2019-04-16}
+ TITLE = {The Raven},
+ EPRINT = {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
@ONLINE{10.15:109,
- ENTRYSUBTYPE = {Online forum post},
+ ENTRYSUBTYPE = {Online forum post},
AUTHOR = {{National Aeronautics Space Administration}},
AUTHOR+an:username = {1="nasa"},
- TITLE = {I'm {NASA} Astronaut {Scott} {Tingle}. {Ask}
- me anything about adjusting to being back on
- {Earth} after my first spaceflight!},
- EPRINT = {Reddit},
- URL = {https://www.reddit.com/r/IAmA/comments/9fagqy/im_nasa_astronaut_scott_tingle_ask_me_anything/},
- DATE = {2018-09-12}
+ TITLE = {I'm {NASA} Astronaut {Scott} {Tingle}. {Ask}
+ me anything about adjusting to being back on
+ {Earth} after my first spaceflight!},
+ EPRINT = {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)
@@ -2506,11 +2533,11 @@
}
% (APA 11.4 Example 5)
-% For courts and year attached to specific elements of the citation list,
+% For courts and years attached to specific elements of the citation list,
% don't use ORGANIZATION/DATE, use literal citeorg/citedate annotations
% use the citeinfo annotation with the special annotation value "appeal" for
% any affirmed/repealed status in the citatation list
-% DATA/ORIGDATE are also included to make citations work
+% DATE/ORIGDATE are also included to make citations work
@JURISDICTION{11.4:5,
TITLE = {Durflinger v. Artiles},
CITATION = {563 F.Supp. 332 and aff'd and 727 F.2d 888},
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 a1d1a5dfb79..11282803ef1 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 ae73685c101..88c1d101ab5 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
@@ -199,19 +199,23 @@ However, in parenthetical cites, authors are separated by «\&»:\\
\apaex{\textcite{8.17g}}\\
\apaex{\parencite{8.17h}}
+\noindent\apa{8.18}\\
\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}}
+\apaex{\textcite{8.18d}}\\
+\apaex{\textcite{8.18g}}\\
+\apaex{\textcite{8.18h}}
\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}}
+\apaex{\textcite{8.18f}}\\
+\apaex{\parencite{8.18e,8.18f}}
\noindent\apa{8.19}\\
Citations of works by same authors in the same year:\\
@@ -326,6 +330,16 @@ list member.
\end{refsection}
\newpage
+% (APA 9.14)
+\begin{refsection}
+
+\nocite{9.14:1,9.14:2}
+
+\printbibliography[title={APA 9.14--Misc Date Elements}]
+
+\end{refsection}
+\newpage
+
% (APA 9.44)
\begin{refsection}
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 435a58cdd32..315ee33446e 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 6c140a83eab..039d2bc5519 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={9.15},
+ revision={9.16},
date={\today}}
\hypersetup{%
@@ -44,6 +44,9 @@ 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{9.16}
+|biber| 2.18+ and and |biblatex| 3.18 + are \emph{required}.
+
\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
@@ -139,7 +142,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. Thanks to Vítor Míguez for the
-Galacian localisation.
+Galacian localisation. Thanks to Abdulkerim Gok for the Turkish
+translation.
\section{Use}\label{ref:use}
\label{use}
@@ -148,10 +152,11 @@ through the provided \TeX Live update utilities which will install it
automatically for you. If you need to install manually (to use a new
version which has not yet been published to the \TeX Live updaters, for
example), you can download it from CTAN and then, put the \path{.cbx},
-\path{.bbx} and \path{.lbx} files in your texmf tree, usually:\\
+\path{.bbx},\path{.dbx} and \path{.lbx} files in your texmf tree, usually:\\
\noindent\path{<texmf>/tex/latex/biblatex/cbx/apa.cbx}\\
\path{<texmf>/tex/latex/biblatex/bbx/apa.bbx}\\
+\path{<texmf>/tex/latex/biblatex/dbx/apa.dbx}\\
\path{<texmf>/tex/latex/biblatex/lbx/<language>-apa.lbx}\\
\noindent Specify the style in the usual way when loading Bib\LaTeX. If you
@@ -388,6 +393,16 @@ the examples.
\begin{changelog}
+\begin{release}{9.16}{2022-06-22}
+\item Minor documentation and bug fixes
+\item Added Turkish localisation
+\item Many German localisation enhancements
+\item Adding support for season year divisions (APA 9.14)
+\item Corrected support for plural ``et al'' requirement using new biblatex
+ feature
+\item Implemented citation name sorting requirement using new biblatex feature
+\end{release}
+
\begin{release}{9.15}{2021-12-24}
\item Remove (need for) |GROUPAUTHOR| field
\item Added Catalan support
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 4d9ee874c65..ad5493e2646 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{american-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{american}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -264,7 +265,8 @@
washington = {{Washington}{{W\adddot A\adddot}}},
westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
- wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}},
+ publication = {{Publication}{Publication}}
}
%
@@ -276,68 +278,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 5523f83e17c..ee19f6dd0a4 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}[2021/12/24\space v9.15\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2022/06/22\space v9.16\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{same} % APA examples all have URLs in same font as text
@@ -157,37 +157,41 @@
or test {\ifentrytype{legal}}
or ( test {\ifentrytype{legadminmaterial}} and
test {\ifkeyword{proposed}} ) }
- {\printtext{%
- \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
+ {\printtext[#1date]{%
+ \mkbibdateapalongmdy{#1year}{#1yeardivision}{#1month}{#1day}%
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
{\bibdatedash\bibstring{present}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalongmdy{}{}{#1endday}}}%
- {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
- {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
+ {\iffieldundef{#1endyeardivision}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalongmdy{}{}{}{#1endday}}}%
+ {\mkbibdateapalongmdy{}{}{#1endmonth}{#1endday}}}%
+ {\mkbibdateapalongmdy{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}}}
+ {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
\dateuncertainprint}}
{\printtext{%
- \mkbibdateapalong{#1year}{#1month}{#1day}%
+ \mkbibdateapalong{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
{\bibdatedash\bibstring{present}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalong{}{}{#1endday}}}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
+ {\iffieldundef{#1endyeardivision}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalong{}{}{}{#1endday}}}%
+ {\mkbibdateapalong{}{}{#1endmonth}{#1endday}}}%
+ {\mkbibdateapalong{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}%
+ \dateeraprint{#1endyear}}}
+ {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
\enddateuncertainprint}}}}%
\endgroup}
@@ -196,24 +200,26 @@
\begingroup
\blx@metadateinfo{#1}%
\iffieldundef{#1year}{}
- {\printtext{%
+ {\printtext[#1date]{%
\datecircaprint
- \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+ \mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
\dateuncertainprint
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
{\bibdatedash\bibstring{present}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalongextra{}{}{#1endday}}}
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
+ {\iffieldundef{#1endyeardivision}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalongextra{}{}{}{#1endday}}}
+ {\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}%
+ \dateeraprint{#1endyear}}}
+ {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
\enddateuncertainprint}}}%
\endgroup}
@@ -226,8 +232,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (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.17,8.18) More than two authors is truncated to one but overriden for list ambiguity to
+% point of no ambiguity but only when same year.
% (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
@@ -236,6 +242,25 @@
% (APA Figure 9.2) Sorting ignores punctuation in names
% (APA 9.47) Ignore "The", "An" and "A" when sorting titles
+% Used for sorting citations with biblatex option "sortcites" as this needs to use
+% the silly APA standards for name list visibility (8.17, 8.18) in cites which differs from the reference list.
+\DeclareSortingNamekeyTemplate[apasortcite]{
+ \visibility{cite}
+ \keypart{
+ \namepart[use=true]{prefix}
+ \namepart{family}
+ }
+ \keypart{
+ \namepart{given}
+ }
+ \keypart{
+ \namepart{suffix}
+ }
+ \keypart{
+ \namepart[use=false]{prefix}
+ }
+}
+
\DeclareNosort{
\nosort{setnames}{\regexp{\p{General_Category=Punctuation}}}
\nosort{settitles}{\regexp{\A(?:The|An|A)\s+}}
@@ -322,6 +347,7 @@
maxitems=999,%
origdate=apalong,%
pagetracker=true,%
+ pluralothers=true,%
sortcites=true,%
sorting=apa,%
uniquelist=minyear,%
@@ -332,7 +358,35 @@
usetranslator=true,%
usenarrator=true}
+
+% 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}
+}
+
+% Force, in every refsection, the generation of refcontext data with a
+% sorting name key template which works for citation sorting with sortcites. This
+% would not be generated in the .bcf otherwise and therefore no sorted list
+% with this sorting name key tenplate would generated in teh .bbl by biber because no
+% \printbibliography would be executed in this context since it is only
+% used for sorting of citations truncated to one name as per 8.17/8.18.
%
+% Two things needs to happen in general:
+% 1. Generate the refcontext sorted data list in the .bbl (biber) which requires a datalist
+% section in the .bcf. This latter is done by \printbibliography/\printbiblist or \GenRefcontextData
+% when no \printbibliography/\printbiblist is done in the refcontext
+% 2. Switch to the relevant refcontext at the right time in order to pull the date from the
+% correct data list (\newrefcontext/\begin{refcontext})
+\AtBeginRefsection{\GenRefcontextData{sortingnamekeytemplatename=apasortcite}}
+% Switch to the reference context using citation visibility setting for sorting of citations
+\AtEveryCite{\localrefcontext[sortingnamekeytemplatename=apasortcite]}
+
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
@@ -367,6 +421,7 @@
\map{
\pertype{inproceedings}
\step[notfield=editor, final]
+ \step[notfield=crossref, final]% A bit suspect but assuming that any crossref contains EDITOR
\step[fieldsource=booktitle, fieldtarget=journaltitle]
\step[typesource=inproceedings, typetarget=article]
}
@@ -427,7 +482,7 @@
\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
% NOTE
-\DeclareFieldFormat[legmaterial,legadminmaterial]{note}{\mkbibparens{#1}}
+\DeclareFieldFormat[legmaterial,legadminmaterial,report]{note}{\mkbibparens{#1}}
% BOOKTITLEADDON
\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
@@ -451,7 +506,6 @@
\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
% CHAPTER
-
\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
% NUMBER
@@ -467,7 +521,8 @@
\ifthenelse{%
\iffieldequalstr{type}{report}\OR%
\iffieldequalstr{type}{execorder}}{\bibcpstring{number}~\apanum{#1}}{\apanum{#1}}}
-
+\DeclareFieldFormat[thesis]{number}{%
+ \bibcpstring{publication}\setunit{\addspace}\bibcpstring{number}~\apanum{#1}}
% PAGES
\DeclareFieldFormat{pageswithprefix}{\mkpageprefix[bookpagination]{#1}}
@@ -496,10 +551,6 @@
\DeclareFieldFormat[dataset,software]{version}{\bibcpstring{version}~#1}
\DeclareFieldFormat[online]{version}{\mkbibparens{#1}}
-% URL
-\DeclareFieldFormat{url}{\url{#1}}
-\DeclareFieldFormat{urldate}{#1}
-
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -522,16 +573,6 @@
% 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}{%
@@ -575,7 +616,7 @@
{}}
\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\newunitpunct}
-\DeclareDelimAlias*[bib,biblist]{nonameyeardelim}{nameyeardelim}
+\DeclareDelimAlias[bib,biblist]{nonameyeardelim}{nameyeardelim}
\renewbibmacro*{author/editor}{%
\ifnameundef{author}
@@ -730,7 +771,8 @@
\setunit{\subtitlepunct}%
\printfield[apacase]{subtitle}}}%
\setunit{\addspace}%
- \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \ifthenelse{\ifentrytype{inbook}\OR\ifentrytype{thesis}}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \ifentrytype{thesis}{\usebibmacro{addinfo3}}{}%
\setunit{\addspace}%
\printfield{titleaddon}%
\setunit{\addspace}%
@@ -743,7 +785,6 @@
\printfield{edition}%
\setunit*{\addcomma\addspace}%
\ifthenelse{\ifentrytype{report}\OR%
- \ifentrytype{thesis}\OR%
\ifentrytype{unpublished}\OR%
\ifentrytype{dataset}\OR%
\ifentrytype{software}\OR%
@@ -753,9 +794,9 @@
\setunit*{\addcomma\addspace}%
\ifentrytype{inbook}{\printfield{pages}}{}%
\setunit*{\addcomma\addspace}%
- \ifentrytype{book}{\printfield{volumes}}{}%
+ \ifthenelse{\ifentrytype{book}\OR\ifentrytype{inbook}}{\printfield{volumes}}{}%
\setunit*{\addcomma\addspace}%
- \ifentrytype{book}{\printfield{volume}}{}}}
+ \ifthenelse{\ifentrytype{book}\OR\ifentrytype{inbook}}{\printfield{volume}}{}}}
% Additional post title information in brackets unless it's the meta subtype "nonacademic"
% which is used to conditionalise date formats in the .lbx files
@@ -767,22 +808,33 @@
{\bibcplstring{\thefield{entrysubtype}}}
{\printfield{entrysubtype}}}%
\setunit*{\addsemicolon\addspace}%
- \printfield{note}}}
+ \ifentrytype{report}{}{\printfield{note}}}}
% number/issue information
\newbibmacro*{addinfo3}{%
- \iffieldundef{type}
- {\iffieldundef{issue}
- {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}
- {\printfield{issue}\setunit{\addspace}%
- \iffieldundef{number}
+ \ifentrytype{thesis}
+ {\iffieldundef{number}
+ {}
+ {\printtext[parens]{\printfield{number}}}%
+ \setunit{\addspace}%
+ \iffieldundef{type}
+ {}
+ {% Inconsistent - standard thesis types have institution inside the brackts, manual types outside ...
+ \ifthenelse{\iffieldequalstr{type}{phdthesis}\OR\iffieldequalstr{type}{mathesis}}
+ {\printtext[brackets]{\printfield{type}\setunit*{\addcomma\addspace}\printlist{institution}}}
+ {\printtext[brackets]{\printfield{type}}\setunit*{\adddot\addspace}\printlist{institution}}}}
+ {\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}}
+ {\printfield{type}\setunit{\addspace}%
+ \iffieldundef{number}
+ {}
+ {\bibcpstring{number}~\printfield{number}}}}% Inconsistent - numbers after type aren't necessarily numbers ...
+ \ifthenelse{\ifentrytype{dataset}\OR\ifentrytype{software}}
{\setunit*{\addsemicolon\addspace}%
\printfield{version}}
{}}
@@ -1284,7 +1336,9 @@
{\usebibmacro{in}%
\printnames[apanames][-\value{listtotal}]{execproducer}%
\setunit{\addspace}%
- \bibcplstring[\mkbibparens]{execproducers}%
+ \ifthenelse{\the\c@execproducer=1}%
+ {\bibcplstring[\mkbibparens]{execproducer}}
+ {\bibcplstring[\mkbibparens]{execproducers}}%
\setunit{\addcomma\addspace}%
\printfield{maintitle}}}
@@ -1383,24 +1437,22 @@
\settoggle{bbx:annotation}{#1}}
\ExecuteBibliographyOptions{annotation=true}
+\long\def\blxapa@appunit#1{%
+ \iftoggle{blx@keepunit}
+ {}
+ {\gappto\blx@unitpunct{#1}%
+ \global\toggletrue{blx@unit}}}
+
\renewbibmacro*{annotation}{%
- \ifboolexpr{test {\iffieldundef{annotation}}
- or not togl {bbx:annotation}}
- {\IfFileExists{\bibannotationprefix\thefield{entrykey}.tex}
- {\begingroup
- \togglefalse{blx@bibliography}%
- \newline
- \setunit{}%
- \printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}%
- \endgroup}
- {}}
+ \iftoggle{bbx:annotation}
{\begingroup
\togglefalse{blx@bibliography}%
- \newline
- \setunit{}%
- \printfield{annotation}%
- \endgroup}}
-
+ \blxapa@appunit{\newline}%
+ \iffieldundef{annotation}
+ {\printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}}
+ {\printfield{annotation}}%
+ \endgroup}
+ {}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1904,6 +1956,8 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
+ \printfield{note}%
+ \setunit{\addspace}\newblock
\usebibmacro{apa:related}%
\newunit\newblock
\printlist{institution}%
@@ -1951,8 +2005,6 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printlist{institution}%
- \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{doi+url}%
@@ -2066,9 +2118,22 @@
-%(APA 9.35) No periods after URLS
+%(APA 9.35) No periods after URLS and DOIs
% we'll override a global url option for for @online entries
\ExecuteBibliographyOptions[online]{url=true}
+
+\DeclareFieldFormat{doi}{%
+ \ifhyperref
+ {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
+ {\nolinkurl{https://doi.org/#1}}%
+ \nopunct}
+
+\DeclareFieldFormat{url}{\url{#1}\nopunct}
+
+\DeclareFieldFormat{urldate}{%
+ \bibstring{retrieved}\space#1%
+ \urldatecomma\bibstring{from}}
+
\newbibmacro*{doi+url}{%
\ifboolexpr{ test {\iffieldundef{doi}}
or not togl {bbx:doi}}
@@ -2078,7 +2143,6 @@
{\usebibmacro{url+urldate}%
\setunit{\addspace}}}
{\printfield{doi}%
- \renewcommand*{\finentrypunct}{\relax}%
\setunit{\addspace}}}
\renewbibmacro*{url+urldate}{%
@@ -2086,18 +2150,9 @@
{}
{\iffieldundef{urlyear}
{}
- {\bibstring{retrieved}%
- \setunit{\addspace}%
- \printurldate
- \setunit{\urldatecomma}%
- \bibstring{from}%
+ {\printurldate
\setunit{\addspace}}%
- \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
-
-\DeclareFieldFormat{doi}{%
- \ifhyperref
- {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
- {\nolinkurl{https://doi.org/#1}}}
+ \printfield{url}}}
\newbibmacro*{location+publisher}{%
\printlist{location}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 22e489feaa0..591fa50aea7 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}[2021/12/24\space v9.15\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2022/06/22\space v9.16\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -45,7 +45,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (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]{%
@@ -118,12 +117,12 @@
\def\citeresetapa{\global\let\cbx@apa@names\@empty}
\citeresetapa
\def\cbx@apa@ifnamesaved{%
- \xifinlist{\thefield{fullhash}}{\cbx@apa@names}
+ \xifinlist{\thefield{namehash}}{\cbx@apa@names}
{\@firstoftwo}
{\@secondoftwo}}
\newbibmacro*{cite:author}{%
- \iffieldequals{fullhash}{\cbx@lasthash}
+ \iffieldequals{namehash}{\cbx@lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
@@ -131,7 +130,7 @@
{\ifnameundef{labelname}
% No author/editor
{\usebibmacro{cite:noname}%
- \savefield{fullhash}{\cbx@lasthash}}
+ \savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
{\printnames{labelname}}%
@@ -139,20 +138,11 @@
{\printnames{shortauthor}}
{\printnames[labelname]{author}%
\addspace\printnames[sabrackets]{shortauthor}}}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
-% Using fullhash instead of namehash otherwise we may omit namelist for
-% lists which are equal only because of minnames truncation i.e:
-%
-% X and Y and Z (2009)
-% X and W and V (2010)
-%
-% which have the same namehash due to minnames visibility truncation to 1
-% would be printed incorrectly as
-% \cite{one, two} -> X, Y & Z 2009, 2010
\newbibmacro*{cite}{%
- \iffieldequals{fullhash}{\cbx@lasthash}
+ \iffieldequals{namehash}{\cbx@lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
@@ -162,7 +152,7 @@
{\usebibmacro{cite:noname}%
\setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx@lasthash}}
+ \savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
{\printnames{labelname}}%
@@ -172,14 +162,14 @@
\addspace\printnames[sabrackets]{shortauthor}}}%
\setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
\renewcommand*{\iffinalcitedelim}{%
\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
\newbibmacro*{textcite}{%
- \iffieldequals{fullhash}{\cbx@lasthash}
+ \iffieldequals{namehash}{\cbx@lasthash}
% Compact cite - more than one thing for same author
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}
@@ -226,7 +216,7 @@
% Actual year printing
\usebibmacro{cite:plabelyear+extradate}%
% Save name hash for checks later
- \savefield{fullhash}{\cbx@lasthash}}%
+ \savefield{namehash}{\cbx@lasthash}}%
\stepcounter{textcitecount}}}
\newbibmacro*{cite:plabelyear+extradate}{%
@@ -236,6 +226,8 @@
\clearfield{labelday}% don't want days in citations
\clearfield{labelendmonth}% don't want months in citations
\clearfield{labelendday}% don't want days in citations
+ \clearfield{labelyeardivision}% don't want yeardivisions in citations
+ \clearfield{labelendyeardivision}% don't want yeardivisions in citations
\iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges
{\clearfield{labelendyear}}
{}%
@@ -364,11 +356,11 @@
\newbibmacro*{citeyear}{%
\iffieldundef{labelyear}
{\usebibmacro{cite:init}}
- {\iffieldequals{fullhash}{\cbx@lasthash}
+ {\iffieldequals{namehash}{\cbx@lasthash}
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}
{\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
%
@@ -424,9 +416,9 @@
\global\undef\cbx@lasthash}
\newbibmacro*{cite:post}{%
- \xifinlist{\thefield{fullhash}}{\cbx@apa@names}
+ \xifinlist{\thefield{namehash}}{\cbx@apa@names}
{}
- {\listxadd{\cbx@apa@names}{\thefield{fullhash}}}}
+ {\listxadd{\cbx@apa@names}{\thefield{namehash}}}}
\newbibmacro*{cite:labelyear}{%
\printfield{labelyear}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index f15b08239e0..dc81deefca1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2021/12/24\space v9.15\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2022/06/22\space v9.16\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index 84a2cccda3b..b511a99e173 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{austrian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,56 +67,130 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {austrian},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%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
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% 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
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
% commenton = {{Comment\space on}{Comment\space on}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
@@ -125,9 +200,9 @@
with = {{mit}{mit}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -135,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -151,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 aca23ff9439..2cdaf9e3417 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{brazilian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -134,7 +135,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -146,71 +148,89 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#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 d5b9bff6273..95546c2df06 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{british-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{british}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
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}}
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+ publication = {{Publication}{Publication}}
}
%
@@ -150,68 +152,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
index c4749c28db6..877dc0e9810 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{catalan-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{catalan-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
% Translation based on:
% spanish-apa.lbx file (for source to translate from)
@@ -10,6 +10,7 @@
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -160,7 +161,8 @@
annodomini = {{despr\'es\space de\space Crist}{dC}},
beforechrist = {{abans\space de\space Crist}{aC}},
commonera = {{era\space comuna}{e\adddot c\adddot}},
- beforecommonera = {{abans\space de\space l'era\space comuna}{a\adddot e\adddot c\adddot}}
+ beforecommonera = {{abans\space de\space l'era\space comuna}{a\adddot e\adddot c\adddot}}
+ % publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -169,140 +171,90 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#3}%
- {}%
- {el\addspace\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {\addspace{en}\addspace}%
- {\iffieldundef{#3}%
- {en\addspace}%
- {\addspace{de}\addspace}%
- \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#2}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\addspace}%
- \thefield{#1}}}%
- \def\apa@lbx@es@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@es@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@es@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@es@mkdaterangeapalongextra{#1}}%
-}
-
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {el\addspace\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {\addspace{en}\addspace}%
+ {\iffieldundef{#4}%
+ {en\addspace}%
+ {\addspace{de}\addspace}%
+ \mkbibmonth{\thefield{#3}}{\addspace{de}\addspace}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 456b176a14b..46abe45d0cd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{danish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -150,7 +151,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -162,73 +164,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\thefield{#1}}%
- \iffieldundef{#3}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
- {}
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}%
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\thefield{#1}\printfield{extradate}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
- {}
+ {}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONNTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\thefield{#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 61df9113613..36e54273ed1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{dutch-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -150,71 +152,89 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#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 d6bf533c5f0..e407b5bcb6a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{english-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{english}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -140,7 +141,8 @@
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}}
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+ publication = {{Publication}{Publication}}
}
%
@@ -152,68 +154,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
index 8df87650c80..0e2559833fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{finnish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{finnish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
% Translations based on:
% https://libguides.oulu.fi/tieteellinentiedonhankinta/apa
@@ -6,6 +6,7 @@
% https://uva.libguides.com/kirjoitusohjeet/esimerkit-APA7
\InheritBibliographyExtras{finnish}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -146,7 +147,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -158,68 +160,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
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 04b843d241f..62e628684d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{french-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{french}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -136,7 +137,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -145,71 +147,89 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
index 65e3c95bf11..0d9a6166542 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
@@ -1,8 +1,9 @@
-\ProvidesFile{galician-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -154,6 +155,7 @@
beforechrist = {{antes\space de\space Cristo}{a\adddot C\adddot}},
commonera = {{era\space com\'un}{e\adddot c\adddot}},
beforecommonera = {{antes\space da\space era\space com\'un}{a\adddot e\adddot c\adddot}}
+% publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -162,72 +164,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
{}%
- {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
- \mkbibmonth{\thefield{#2}}%
-}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {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}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \thefield{#1}}}}
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#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 56b83de0b88..c0439527cc7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{german-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,54 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {german},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%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
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% 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}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% 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
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -125,9 +200,9 @@
available = {{Erh\"altlich}{Erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -135,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -151,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 3ce1beca9e9..55deff23cee 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{greek-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -168,71 +170,89 @@
\else
#1\BibliographyWarning{Month out of range}%
\fi}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \lbx@gr@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \lbx@gr@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \lbx@gr@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
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 0760cb84aa7..19bad1de8ac 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{italian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -150,68 +152,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
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 35e2c389bdf..ec9190592ab 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{naustrian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,54 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {naustrian},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%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
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% 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}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Autor}{Aut\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Schriftsteller}{Schriftsteller}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}}
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% 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
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -125,9 +200,9 @@
available = {{erh\"altlich}{erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -135,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -151,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 766be76849f..a53119f8132 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{ngerman-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,54 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {ngerman},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%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
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% 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}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% 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
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
abstract = {{Abstract}{Abstract}},
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
@@ -126,9 +201,9 @@
available = {{Erh\"altlich}{Erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -136,13 +211,64 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\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}}
+ nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -153,139 +279,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 89c32580d6d..0f413b1a649 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{norsk-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
+\NewBibliographyString{publication}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -98,7 +99,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -108,75 +110,94 @@
% 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{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#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 2b1a2246464..dfb908e1424 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{norwegian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
+\NewBibliographyString{publication}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -137,7 +138,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -149,73 +151,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
index 9da8adbda18..fb8861e044b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -65,54 +66,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {nswissgerman},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%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
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% 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}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}}
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% 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
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -124,9 +199,9 @@
available = {{erh\"altlich}{erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -134,12 +209,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -150,139 +276,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 f9e0e316c3f..f0897caef96 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{nynorsk-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -150,73 +152,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#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
index 1dbfefa02b0..f8a48b2e1c4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{portuguese-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -134,7 +135,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -146,71 +148,90 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \renewcommand{\apashortdash}{~}%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
index fc84c011b81..77ee7f87c03 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{russian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -133,7 +134,8 @@
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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -156,73 +158,91 @@
\fi}%
\DeclareBibliographyExtras{%
- \def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#1}%
+ {}
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx@sl@mkbibmonth{\thefield{#3}}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#1}%
+ {}
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx@sl@mkbibmonth{\thefield{#3}}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
- {\mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}%
- \iffieldundef{#1}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
+ {\mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx@sl@mkbibmonth{\thefield{#3}}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
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 d393becabfe..1d37d34dd0f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{slovene-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -161,7 +162,8 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -185,75 +187,94 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \lbx@sl@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \lbx@sl@mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
\endinput
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 83bfc65e5d0..b4b1f2e7240 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,8 +1,9 @@
-\ProvidesFile{spanish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -154,6 +155,7 @@
beforechrist = {{antes\space de\space Cristo}{a\adddot\space C\adddot}},
commonera = {{era\space com\'un}{e\adddot c\adddot}},
beforecommonera = {{antes\space de\space la\space era\space com\'un}{a\adddot e\adddot c\adddot}}
+ % publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -162,140 +164,90 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#3}%
- {}%
- {el\addspace\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {\addspace{en}\addspace}%
- {\iffieldundef{#3}%
- {en\addspace}%
- {\addspace{de}\addspace}%
- \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#2}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\addspace}%
- \thefield{#1}}}%
- \def\apa@lbx@es@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@es@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@es@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@es@mkdaterangeapalongextra{#1}}%
-}
-
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {el\addspace\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {\addspace{en}\addspace}%
+ {\iffieldundef{#4}%
+ {en\addspace}%
+ {\addspace{de}\addspace}%
+ \mkbibmonth{\thefield{#3}}{\addspace{de}\addspace}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
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 bab849a095f..95938c6a77d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{swedish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -142,79 +143,97 @@
% 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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
-
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
index b2730b66f3b..7a9b8015ddf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{swissgerman-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2022/06/22\space v9.16\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
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,55 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {swissgerman},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%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
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% 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}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{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}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% 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
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -126,9 +200,9 @@
available = {{erh\"altlich}{erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -136,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\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}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -152,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
new file mode 100644
index 00000000000..fae30835ebc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
@@ -0,0 +1,360 @@
+\ProvidesFile{turkish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\InheritBibliographyExtras{turkish}
+
+\NewBibliographyString{publication}
+\NewBibliographyString{jourarticle}
+\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{commenton}
+\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}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
+
+
+\DeclareBibliographyStrings{%
+ inherit = {turkish},
+ jourarticle = {{makale}{makale}},
+% tothe = {{ona}{ona}}, % no certain translation
+% ofthe = {{onun}{onun}}, % no certain translation
+ unitednations = {{Birle\c{s}mi\c{s}\space Milletler}{BM}},
+ charter = {{t\"{u}z\"{u}k}{t\"{u}z\"{u}k}}, % not sure about the translation
+ proposed = {{teklif\space edilmi\c{s}}{teklif\space ed\adddot}},
+ repealed = {{feshedilmi\c{s}}{fesih\space ed\adddot}},
+ execorder = {{\"{u}st\space karar}{\"{u}st\space karar}},
+ senate = {{senato}{senato}},
+ resolution = {{\c{c}\"{o}z\"{u}m}{\c{c}\"{o}z\adddot}},
+ houseofrepresentatives = {{temsilciler\space meclisi}{tem\adddotspace mec\adddot}},
+ report = {{rapor}{rapor}},
+ us = {{Amerika\space Birle\c{s}ik\space Devletleri}{ABD}},
+ constitution = {{anayasa}{anayasa}},
+ section = {{b\"{o}l\"{u}m}{b\"{o}l\adddot},
+ amendment = {{yasa\space de\u{g}i\c{s}ikli\u{g}i}{yasa\space de\u{g}\adddot}},
+ article = {{makale}{makale}},
+ painting = {{resim}{resim}},
+ present = {{sunum}{sunum}}, %not sure about the translation
+ song = {{\c{s}ark\i}}{\c{s}ark\i}},
+ album = {{alb\"{u}m}{alb\"{u}m}},
+ map = {{harita}{harita}},
+ photograph = {{foto\u{g}raf}{foto\u{g}raf}},
+ photographs = {{foto\u{g}raflar}{foto\u{g}raflar}},
+ powerpoint = {{sunum\space slaytlar\i}{sun\adddotspace slayt\adddot}},
+ lecturenotes = {{notlar}{not\adddot}},
+ podcast = {{ses\space kayd\i}{ses\space kay\adddot}},
+ podcastepisode = {{ses\space kay\i t\space b\"{o}l\"{u}m\"{u}}{ses\space kay\adddotspace b\"{o}l\adddot}},
+ interview = {{m\"{u}lakat]}{m\"{u}lakat}},
+ speech = {{konu\c{s}ma}{konu\c{s}ma}},
+ lithograph = {{litografi}{litografi}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space dizisi}{TV\space dizisi}},
+ tvepisode = {{TV\space dizi\space b\"{o}l\"{u}m\"{u}}{TV\space dizi\space b\"{o}l\adddot}},
+ narrator = {{seslendiren]}{ses\adddot}},
+ narrators = {{seslendirenler}{ses\adddot}},
+ producer = {{yap\i mc \i}{yap\adddot}},
+ producers = {{yap\i mc \i lar}{yap\adddot}},
+ execproducer = {{\"{u}st\space yap\i mc \i}{\"{u}st\space yap\adddot}},
+ execproducers = {{\"{u}st\space yap\i mc \i lar}{\"{u}st\space yap\adddot}},
+ execdirector = {{\"{u}st\space y\"{o}netmen}{\"{u}st\space y\"{o}n\adddot}},
+ execdirectors = {{\"{u}st\space y\"{o}netmenler}{\"{u}st\space y\"{o}n\adddot}},
+ director = {{y\"{o}netmen}{y\"{o}n\adddot}},
+ directors = {{y\"{o}netmenler}{y\"{o}n\adddot}},
+ writer = {{yazar}{yazar}},
+ writers = {{yazarlar}{yazarlar}},
+ host = {{ev\space sahibi}{ev\space sah\adddot}},
+ hosts = {{ev\space sahipleri]}{ev\space sah\adddot}},
+ guestexpert = {{misafir\space uzman}{mis\adddotspace uzm\adddot}},
+ guestexperts = {{misafir\space uzmanlar}{mis\adddotspace uzm\adddot}},
+ with = {{ile}{ile}},
+ manunpub = {{metin\space yay\i mlanmam\i \c{s}}{met\adddotspace yay\i mlanmam\i \c{s}}},
+ maninprep = {{metin\space haz\i rl\i k\space a\c{s}amas\i nda}{met\adddotspace haz\adddotspace a\c{s}a\adddot}},
+ mansub = {{yay\i mlanmak\space i\c{c}in\space g\"{o}nderilmi\c{s}\space metin}{yay\adddotspace i\c{c}in\space g\"{o}n\adddotspace met\adddot}},
+ supplement = {{ek}{ek}},
+ part = {{par\c{c}a}{par\adddot}},
+ andothers = {{ve\space di\u{g}erleri}{ve\space di\u{g}\adddot}},
+ revisededition = {{G\"{o}zden\space ge\c{c}irilmi\c{s}\space bas\i m}{G\"{o}z\adddotspace ge\c{c}\adddotspace bs\adddot}},
+ commenton = {{yorum}{yrm\adddot}}, %not sure about the translation
+ page = {{sayfa}{{}s\adddot}},
+ pages = {{sayfalar}{{}ss\adddot}},
+ on = {{tarihinde}{tar\adddot}},
+ retrieved = {{eri\c{s}im\space tarihi}{eri\c{s}im\space tarihi}},
+ available = {{Haz\i r}{Haz\i r}},
+% from = {{from}{from}}, % there are two forms of "from" in Turkish. not sure to include just one.
+ archivedat = {{ar\c{s}ivde}{ar\c{s}iv\adddot}},
+ reprintas = {{yeni\space bask\i s\i}{yeni\space bs\adddot}},
+ reprintfrom = {{yeni\space bask\i s\i}{yeni\space bs\adddot}},
+ reviewof = {{derleme\space eser}{der\adddotspace eser}},
+ paragraph = {{paragraf}{par\adddot}},
+ paragraphs = {{paragraflar}{Par\adddot}},
+ mathesis = {{y\"{u}ksek\space lisans\space tezi}{Y\adddotspace L\adddotspace tezi}},
+ phdthesis = {{doktora\space tezi}{dok\adddotspace tezi}},
+ origyear = {{as\i l\space eser\space yay\i n\space tarihi}{as\i l\space eser\space yay\i n\space tarihi}},
+ typechair = {{ba\c{s}kan}{ba\c{s}\adddot}},
+ typechairs = {{ba\c{s}kanlar}{ba\c{s}\adddot}},
+ typevolume = {{cilt\space edit\"{o}r\"{u}}{cilt\space ed\adddot}},
+ typevolumes = {{cilt\space edit\"{o}rleri}{cilt\space ed\adddot}},
+ typeseries = {{seri\space edit\"{o}r\"{u}}{seri\space ed\adddot}},
+ typeseriess = {{seri\space edit\"{o}rleri}{seri\space ed\adddot}},
+ typevolseries = {{cilt\space ve\space seri\space edit\"{o}r\"{u}}{cilt\space\& seri\space ed\adddot}},
+ typevolseriess = {{cilt\space ve\space seri\space edit\"{o}rleri}{cilt\space\& seri\space ed\adddot}},
+ annodomini = {{milattan\space sonra}{M\adddotspace S\adddot}},
+ beforechrist = {{milattan\space \"{o}nce}{M\adddotspace \"{O}\adddot}},
+ commonera = {{milattan\space sonra}{M\adddotspace S\adddot}},
+ beforecommonera = {{milattan\space \"{o}nce}{M\adddotspace \"{O}\adddot}},
+ publication = {{yay\i n}{yay\i n}}
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
+}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% 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#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput \ No newline at end of file