texlive[63719] Master/texmf-dist: biblatex-apa
commits+karl at tug.org
commits+karl at tug.org
Sat Jun 25 15:30:46 CEST 2022
Revision: 63719
http://tug.org/svn/texlive?view=revision&revision=63719
Author: karl
Date: 2022-06-25 15:30:46 +0200 (Sat, 25 Jun 2022)
Log Message:
-----------
biblatex-apa
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +284,7 @@
}
@BOOK{8.17d,
- GROUPAUTHOR = {{National Institute of Mental Health}},
+ author = {{National Institute of Mental Health}},
SHORTAUTHOR = {NIMH},
TITLE = {Title},
DATE = {2020}
@@ -291,7 +291,7 @@
}
@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}
}
+ at BOOK{8.18g,
+ AUTHOR = {Author Red and Author Green and Author Black and Author Blue},
+ TITLE = {Title One},
+ DATE = {2022}
+}
+
+ at 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,7 +444,7 @@
% (APA 8.21)
@BOOK{8.21a,
- GROUPAUTHOR = {{The American Psychological Association}},
+ author = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title1},
DATE = {2017}
@@ -439,7 +451,7 @@
}
@BOOK{8.21b,
- GROUPAUTHOR = {{The American Psychological Association}},
+ author = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title2},
DATE = {2006}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2022-06-25 13:30:46 UTC (rev 63719)
@@ -68,6 +68,25 @@
DATE = {2014}
}
+% Testing seasons
+ at ARTICLE{9.14:1,
+ AUTHOR = {Arthur Test},
+ TITLE = {Test Title},
+ JOURNALTITLE = {Seasonal Journal},
+ VOLUME = {33},
+ NUMBER = {2},
+ DATE = {2012-22}
+}
+
+ at 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,7 +1404,7 @@
% (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}
@@ -1392,7 +1411,7 @@
}
@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)
- at THESIS{10.6:64,
+% Note the override of the auto-populated "phdthesis" type as this is a
+% non-standard, non-localised string type
+ at 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)
- at THESIS{10.6:65,
+ at 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)
- at THESIS{10.6:66,
+ at 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},
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2022-06-25 13:30:46 UTC (rev 63719)
@@ -199,6 +199,7 @@
\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:\\
@@ -205,13 +206,16 @@
\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 @@
\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}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2022-06-25 13:30:46 UTC (rev 63719)
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip at kime.org.uk},
- revision={9.15},
+ revision={9.16},
date={\today}}
\hypersetup{%
@@ -44,6 +44,9 @@
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 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 @@
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 @@
\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
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +278,7 @@
\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}} }
@@ -283,22 +285,28 @@
{\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}} }
@@ -305,22 +313,28 @@
{\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}} }
@@ -327,17 +341,23 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
+ {\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}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,9 +200,9 @@
\begingroup
\blx at metadateinfo{#1}%
\iffieldundef{#1year}{}
- {\printtext{%
+ {\printtext[#1date]{%
\datecircaprint
- \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+ \mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
\dateuncertainprint
\iffieldundef{#1endyear}%
@@ -205,15 +209,17 @@
{}%
{\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 at colon@search\MakeSentenceCase*{#1}}}
% NOTE
-\DeclareFieldFormat[legmaterial,legadminmaterial]{note}{\mkbibparens{#1}}
+\DeclareFieldFormat[legmaterial,legadminmaterial,report]{note}{\mkbibparens{#1}}
% BOOKTITLEADDON
\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
@@ -451,7 +506,6 @@
\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
% CHAPTER
-
\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
% NUMBER
@@ -467,8 +521,9 @@
\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}}
\DeclareFieldFormat[inbook,incollection]{pages}{\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 at 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 at appunit#1{%
+ \iftoggle{blx at keepunit}
+ {}
+ {\gappto\blx at unitpunct{#1}%
+ \global\toggletrue{blx at unit}}}
+
\renewbibmacro*{annotation}{%
- \ifboolexpr{test {\iffieldundef{annotation}}
- or not togl {bbx:annotation}}
- {\IfFileExists{\bibannotationprefix\thefield{entrykey}.tex}
- {\begingroup
- \togglefalse{blx at bibliography}%
- \newline
- \setunit{}%
- \printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}%
- \endgroup}
- {}}
+ \iftoggle{bbx:annotation}
{\begingroup
\togglefalse{blx at bibliography}%
- \newline
- \setunit{}%
- \printfield{annotation}%
- \endgroup}}
-
+ \blxapa at 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,19 +2150,10 @@
{}
{\iffieldundef{urlyear}
{}
- {\bibstring{retrieved}%
- \setunit{\addspace}%
- \printurldate
- \setunit{\urldatecomma}%
- \bibstring{from}%
+ {\printurldate
\setunit{\addspace}}%
- \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
+ \printfield{url}}}
-\DeclareFieldFormat{doi}{%
- \ifhyperref
- {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
- {\nolinkurl{https://doi.org/#1}}}
-
\newbibmacro*{location+publisher}{%
\printlist{location}%
\setunit*{\addcomma\space}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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 at apa@names\@empty}
\citeresetapa
\def\cbx at apa@ifnamesaved{%
- \xifinlist{\thefield{fullhash}}{\cbx at apa@names}
+ \xifinlist{\thefield{namehash}}{\cbx at apa@names}
{\@firstoftwo}
{\@secondoftwo}}
\newbibmacro*{cite:author}{%
- \iffieldequals{fullhash}{\cbx at lasthash}
+ \iffieldequals{namehash}{\cbx at 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 at lasthash}}
+ \savefield{namehash}{\cbx at lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
{\printnames{labelname}}%
@@ -139,20 +138,11 @@
{\printnames{shortauthor}}
{\printnames[labelname]{author}%
\addspace\printnames[sabrackets]{shortauthor}}}%
- \savefield{fullhash}{\cbx at lasthash}}}%
+ \savefield{namehash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
-% Using fullhash instead of namehash otherwise we may omit namelist for
-% lists which are equal only because of minnames truncation i.e:
-%
-% X and Y and Z (2009)
-% X and W and V (2010)
-%
-% which have the same namehash due to minnames visibility truncation to 1
-% would be printed incorrectly as
-% \cite{one, two} -> X, Y & Z 2009, 2010
\newbibmacro*{cite}{%
- \iffieldequals{fullhash}{\cbx at lasthash}
+ \iffieldequals{namehash}{\cbx at 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 at lasthash}}
+ \savefield{namehash}{\cbx at lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
{\printnames{labelname}}%
@@ -172,7 +162,7 @@
\addspace\printnames[sabrackets]{shortauthor}}}%
\setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx at lasthash}}}%
+ \savefield{namehash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
\renewcommand*{\iffinalcitedelim}{%
@@ -179,7 +169,7 @@
\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
\newbibmacro*{textcite}{%
- \iffieldequals{fullhash}{\cbx at lasthash}
+ \iffieldequals{namehash}{\cbx at 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 at lasthash}}%
+ \savefield{namehash}{\cbx at 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 at lasthash}
+ {\iffieldequals{namehash}{\cbx at lasthash}
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}
{\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx at lasthash}}}%
+ \savefield{namehash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
%
@@ -424,9 +416,9 @@
\global\undef\cbx at lasthash}
\newbibmacro*{cite:post}{%
- \xifinlist{\thefield{fullhash}}{\cbx at apa@names}
+ \xifinlist{\thefield{namehash}}{\cbx at apa@names}
{}
- {\listxadd{\cbx at apa@names}{\thefield{fullhash}}}}
+ {\listxadd{\cbx at apa@names}{\thefield{namehash}}}}
\newbibmacro*{cite:labelyear}{%
\printfield{labelyear}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +277,7 @@
\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}} }
@@ -158,22 +284,28 @@
{\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}} }
@@ -180,23 +312,28 @@
{\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}} }
@@ -203,87 +340,27 @@
{\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 at lbx@de at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@de at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@de at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@de at mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +148,7 @@
\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}} }
@@ -153,22 +155,28 @@
{\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}} }
@@ -175,22 +183,28 @@
{\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}} }
@@ -197,20 +211,26 @@
{\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}}}}}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +152,7 @@
\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}} }
@@ -157,22 +159,28 @@
{\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}} }
@@ -179,22 +187,28 @@
{\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}} }
@@ -201,17 +215,23 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
+ {\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}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,141 +171,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}%
+ {\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
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\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
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\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 at lbx@es at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@es at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@es at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@es at 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
\restorecommand\mkdaterangeapalongextra
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +164,7 @@
\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}} }
@@ -169,24 +171,30 @@
{\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}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#3}%
+ {}%
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\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}} }
@@ -193,24 +201,30 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\thefield{#1}\printfield{extradate}}%
- \iffieldundef{#3}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \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}% MONNTH
+ {}%
+ {\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}} }
@@ -217,18 +231,24 @@
{\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}%
\thefield{#1}}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +152,7 @@
\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}} }
@@ -157,22 +159,28 @@
{\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}} }
@@ -179,22 +187,28 @@
{\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}} }
@@ -201,20 +215,26 @@
{\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}}}}}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +154,7 @@
\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}} }
@@ -159,22 +161,28 @@
{\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}} }
@@ -181,22 +189,28 @@
{\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}} }
@@ -203,17 +217,23 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
+ {\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}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +160,7 @@
\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}} }
@@ -165,22 +167,28 @@
{\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}} }
@@ -187,22 +195,28 @@
{\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}} }
@@ -209,17 +223,23 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
+ {\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}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +147,7 @@
\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}} }
@@ -152,22 +154,28 @@
{\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}} }
@@ -174,22 +182,28 @@
{\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}} }
@@ -196,20 +210,26 @@
{\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}}}}}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +164,7 @@
\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}} }
@@ -169,22 +171,28 @@
{\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}} }
@@ -191,22 +199,28 @@
{\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}} }
@@ -213,21 +227,28 @@
{\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{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
- {}%
- {\addspace}%
- \thefield{#1}}}}
+ {\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}}}}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +277,7 @@
\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}} }
@@ -158,22 +284,28 @@
{\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}} }
@@ -180,23 +312,28 @@
{\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}} }
@@ -203,87 +340,27 @@
{\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 at lbx@de at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@de at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@de at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@de at mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +170,7 @@
\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}} }
@@ -175,22 +177,28 @@
{\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 at 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}} }
@@ -197,22 +205,28 @@
{\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 at 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}} }
@@ -219,20 +233,26 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \lbx at 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}}}}}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +152,7 @@
\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}} }
@@ -157,22 +159,28 @@
{\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}} }
@@ -179,22 +187,28 @@
{\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}} }
@@ -201,17 +215,23 @@
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
+ {\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}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +277,7 @@
\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}} }
@@ -158,22 +284,28 @@
{\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}} }
@@ -180,23 +312,28 @@
{\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}} }
@@ -203,87 +340,27 @@
{\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 at lbx@de at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@de at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@de at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@de at mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +279,7 @@
\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}} }
@@ -160,22 +286,28 @@
{\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}} }
@@ -182,23 +314,28 @@
{\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}} }
@@ -205,87 +342,27 @@
{\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 at lbx@de at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@de at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@de at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@de at mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,9 +110,10 @@
% 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}} }
@@ -117,24 +120,30 @@
{\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}} }
@@ -141,24 +150,30 @@
{\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}} }
@@ -165,18 +180,24 @@
{\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}}}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +151,7 @@
\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}} }
@@ -156,24 +158,30 @@
{\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}} }
@@ -180,24 +188,30 @@
{\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}} }
@@ -204,18 +218,24 @@
{\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}}}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +276,7 @@
\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}} }
@@ -157,22 +283,28 @@
{\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}} }
@@ -179,23 +311,28 @@
{\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}} }
@@ -202,87 +339,27 @@
{\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 at lbx@de at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@de at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@de at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@de at mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +152,7 @@
\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}} }
@@ -157,24 +159,30 @@
{\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}} }
@@ -181,24 +189,30 @@
{\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}} }
@@ -205,18 +219,24 @@
{\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}}}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +148,8 @@
\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}} }
@@ -153,22 +156,28 @@
{\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}} }
@@ -175,22 +184,28 @@
{\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}} }
@@ -197,20 +212,26 @@
{\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}}}}}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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 at sl@mkbibmonth#1{%
@@ -156,8 +158,8 @@
\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}} }
@@ -164,24 +166,30 @@
{\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 at sl@mkbibmonth{\thefield{#2}}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx at 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}} }
@@ -188,24 +196,30 @@
{\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{#3}
+ {\iffieldundef{#1}%
+ {}
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx at 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}} }
@@ -212,17 +226,23 @@
{\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
{}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
+ {\mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx at sl@mkbibmonth{\thefield{#3}}}}%
+ \iffieldundef{#1}% YEAR
+ {}%
{\iffieldundef{#3}%
- {\mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#2}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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 at sl@mkbibmonth#1{%
@@ -185,7 +187,7 @@
\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}} }
@@ -192,24 +194,30 @@
{\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}} }
@@ -216,24 +224,30 @@
{\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}} }
@@ -240,20 +254,27 @@
{\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 at sl@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \lbx at sl@mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,141 +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}%
+ {\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
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\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
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\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 at lbx@es at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@es at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@es at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@es at 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
\restorecommand\mkdaterangeapalongextra
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,13 +143,13 @@
% 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}} }
@@ -155,24 +156,30 @@
{\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}} }
@@ -179,24 +186,30 @@
{\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}} }
@@ -203,18 +216,24 @@
{\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}}}}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2022-06-24 23:49:26 UTC (rev 63718)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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,7 +277,7 @@
\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}} }
@@ -159,22 +284,28 @@
{\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}} }
@@ -181,23 +312,28 @@
{\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}} }
@@ -204,87 +340,27 @@
{\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 at lbx@de at mkdaterangeapalong#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa at lbx@de at mkdaterangeapalongextra#1{%
- \begingroup
- \blx at metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa at lbx@de at mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa at lbx@de at mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx 2022-06-25 13:30:46 UTC (rev 63719)
@@ -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
More information about the tex-live-commits
mailing list.