texlive[52945] Master/texmf-dist: biblatex-apa (27nov19)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 27 23:04:35 CET 2019
Revision: 52945
http://tug.org/svn/texlive?view=revision&revision=52945
Author: karl
Date: 2019-11-27 23:04:35 +0100 (Wed, 27 Nov 2019)
Log Message:
-----------
biblatex-apa (27nov19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/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
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2019-11-27 22:04:35 UTC (rev 52945)
@@ -810,7 +810,8 @@
TITLE = {From this article, it sounds like men are figuring
something out that women have known forever. {I} know of many},
RELATED = {10.1:18r},
- RELATEDTYPE = {commentonarticle},
+ RELATEDTYPE = {commenton},
+ RELATEDSTRING = {Comment on the article},
JOURNALTITLE = {The Washington Post},
KEYWORDS = {nonacademic},
DATE = {2019-01-15},
@@ -1547,7 +1548,8 @@
AUTHOR = {L. A. Mirabito and N. C. Heck},
TITLE = {Bringing {LGBTQ} Youth Theater into the Spotlight},
RELATED = {10.7:67r},
- RELATEDTYPE = {reviewoffilm},
+ RELATEDTYPE = {reviewof},
+ RELATEDSTRING = {Review of the film},
JOURNALTITLE = {Psychology of Sexual Orientation and Gender Diversity},
VOLUME = {3},
NUMBER = {4},
@@ -1571,7 +1573,8 @@
AUTHOR = {F. Santos},
TITLE = {Reframing Refugee Children's Stories},
RELATED = {10.7:68r},
- RELATEDTYPE = {reviewofbook},
+ RELATEDTYPE = {reviewof},
+ RELATEDSTRING = {Review of the book},
JOURNALTITLE = {The New York Times},
KEYWORDS = {nonacademic},
DATE = {2019-01-11},
@@ -1595,7 +1598,8 @@
TITLE = {\textup{The good place} ends its Remarkable Second
Season With Irrational Hope, Unexpected Gifts, and a Smile},
RELATED = {10.7:69r},
- RELATEDTYPE = {reviewoftv},
+ RELATEDTYPE = {reviewof},
+ RELATEDSTRING = {Review of the TV series episode},
ORGANIZATION = {A.V. Club},
DATE = {2018-02-01},
URL = {https://www.avclub.com/the-good-place-ends-its-remarkable-second-season-with-i-1822649316}
@@ -2416,6 +2420,217 @@
URLDATE = {2019-07-03}
}
+% (APA 11.4 Example 1)
+ at JURISDICTION{11.4:1,
+ TITLE = {Brown v. Board of Education},
+ CITATION = {347 U.S. 483},
+ URL = {http://www.oyez.org/cases/1940-1955/347us483},
+ DATE = {1954}
+}
+
+% (APA 11.4 Example 2)
+ at JURISDICTION{11.4:2,
+ TITLE = {Obergefell v. Hodges},
+ CITATION = {576 U.S. \_\_\_},
+ URL = {https://www.supremecourt.gov/opinions/14pdf/14-556_3204.pdf},
+ DATE = {2015}
+}
+
+% (APA 11.4 Example 3)
+% court/date which applies to the entire CITATION list can be given in the
+% ORGANIZATION and DATE fields
+ at JURISDICTION{11.4:3,
+ TITLE = {Daubert v. Merrell Dow Pharmaceuticals, Inc.},
+ CITATION = {951 F.2d 1128},
+ ORGANIZATION = {9th Cir.},
+ URL = {https://openjurist.org/951/f2d/1128/william-dabert-v-merrell-dow-pharmaceuticals},
+ DATE = {1991}
+}
+
+% (APA 11.4 Example 4)
+ at JURISDICTION{11.4:4,
+ TITLE = {Burriola v. Greater Toledo YMCA},
+ CITATION = {133 F.Supp.2d 1034},
+ ORGANIZATION = {N.D. Ohio},
+ URL = {https://law.justia.com/cases/federal/district-courts/FSupp2/133/1034/2293141/},
+ DATE = {2001}
+}
+
+% (APA 11.4 Example 5)
+% For courts and year 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
+ at JURISDICTION{11.4:5,
+ TITLE = {Durflinger v. Artiles},
+ CITATION = {563 F.Supp. 332 and aff'd and 727 F.2d 888},
+ CITATION+an:citeorg = {1="D. Kan.";3="10th Cir."},
+ CITATION+an:citedate = {1="1981";3="1984"},
+ CITATION+an:citeinfo = {2=appeal},
+ URL = {https://openjurist.org/727/f2d/888/durflinger-v-artiles},
+ DATE = {1984},
+ ORIGDATE = {1981}
+}
+
+% (APA 11.4 Example 6)
+ at JURISDICTION{11.4:6,
+ TITLE = {Tarasoff v. Regents of the University of California},
+ CITATION = {17 Cal.3d 425 and 131 Cal. Rptr. 14 and 551 P.2d 334},
+ URL = {https://www.casebriefs.com/blog/law/torts/tors-keyed-to-dobbs/the-duty-to-protect-from-third-persons/tarasoff-v-regents-of-university-of-california},
+ DATE = {1976}
+}
+
+% (APA 11.4 Example 7)
+ at JURISDICTION{11.4:7,
+ TITLE = {Texas v. Morales},
+ CITATION = {826 S.W.2d 201},
+ CITATION+an:citeorg = {1="Tex. Ct. App."},
+ CITATION+an:citedate = {1="1992"},
+ URL = {https://www.leagle.com/decision/19921027826sw2d20111010},
+ DATE = {1992}
+}
+
+% (APA 11.5 Example 8)
+% Notice the use of TITLEADDON here as this shouldn't appear in the
+% citation and so can't be in TITLE - the 11.5 APA section is inconsistent here
+ at LEGISLATION{11.5:8,
+ TITLE = {American With Disabilities Act},
+ TITLEADDON = {of 1990},
+ LOCATION = {42 U.S.C § 12101 \emph{et seq.}},
+ URL = {https://www.ada.gov/pubs/adastatute08.htm},
+ DATE = {1990}
+}
+
+% (APA 11.5 Example 9)
+% Notice the use of TITLEADDON here as this shouldn't appear in the
+% citation and so can't be in TITLE - the 11.5 APA section is inconsistent here
+ at LEGISLATION{11.5:9,
+ TITLE = {Civil Rights Act},
+ TITLEADDON = {of 1964},
+ LOCATION = {Pub. L. No. 88--352, 78 Stat. 241},
+ URL = {https://www.govinfo.gov/content/pkg/STATUE-78/pdf/STATUTE-78-Pg241.pdf},
+ DATE = {1964}
+}
+
+% (APA 11.5 Example 10)
+ at LEGISLATION{11.5:10,
+ TITLE = {Every Student Succeeds Act},
+ LOCATION = {20 U.S.C § 6301},
+ URL = {https://www.congress.gov/114/plaws/publ95/PLAW-114publ95.pdf},
+ DATE = {2015}
+}
+
+% (APA 11.5 Example 11)
+ at LEGISLATION{11.5:11,
+ TITLE = {Lilly Leadbetter Fair Play Act},
+ TITLEADDON = {of 2009},
+ LOCATION = {Pub. L. No. 111-2, 123 Stat. 5},
+ URL = {https://www.govinfo.gov/content/pkg/PLAW-111publ2/pdf/PLAW-111publ2.pdf},
+ DATE = {2009}
+}
+
+% (APA 11.5 Example 12)
+ at LEGISLATION{11.5:12,
+ TITLE = {Patsy Mink Equal Opportunity in Education Act},
+ LOCATION = {20 U.S.C § 1681 \emph{et seq.}},
+ URL = {https://www.justice.org/crt/title-ix-education-amendments-1972},
+ DATE = {1972}
+}
+
+% (APA 11.5 Example 13)
+ at LEGISLATION{11.5:13,
+ TITLE = {Florida Mental Health Act},
+ LOCATION = {Fla. Stat. § 394},
+ URL = {http://www.leg.state.fl.us/statues/index.cfm?App_mode=Display_Statute&URL=0300-0399/0394/0394.html},
+ DATE = {2009},
+ ORIGDATE = {1971}
+}
+
+% (APA 11.6 Example 14)
+ at LEGMATERIAL{11.6:14,
+ TITLE = {Federal Real Property Reform},
+ SUBTITLE = {How cutting red tape and better management count
+ achieve billions in savings, U.S. Senate
+ Committee on Homeland Security and Governmental Affairs},
+ LOCATION = {114th Cong.},
+ NOTE = {testimony of Norman Dong},
+ URL = {http://www.gsa.gov/portal/content/233107},
+ DATE = {2016}
+}
+
+% (APA 11.6 Example 15)
+% Note the use of SHORTTITLE to use a shortened title in citations
+ at LEGMATERIAL{11.6:15,
+ TITLE = {Strengthening the Federal Student Loan Program
+ for Borrowers},
+ SUBTITLE = {Hearing before the U.S. Senate Committee on
+ Health, Education, Labor \& Pensions},
+ SHORTTITLE = {Strengthening the Federal Student Loan Program},
+ LOCATION = {113th Cong.},
+ URL = {https://www.help.senate.gov/hearings/strengthening-the-federal-student-load-program-for-borrowers},
+ DATE = {2014}
+}
+
+% (APA 11.6 Example 16)
+ at LEGISLATION{11.6:16,
+ TITLE = {Mental Health on Campus Improvement Act},
+ LOCATION = {H.R 1100, 113th Cong.},
+ URL = {https://www.congress.gov/bill/113th-congress/house-bill/1100},
+ DATE = {2013}
+}
+
+% (APA 11.6 Example 17)
+ at LEGMATERIAL{11.6:17,
+ SOURCE = {senate},
+ TYPE = {resolution},
+ NUMBER = {438},
+ LOCATION = {114th Cong. and 162 Cong. Rec. 2394},
+ NOTE = {enacted},
+ URL = {https://www.congress.gov/congressional-record/2016/04/21/senate-section/article/S2394-2},
+ DATE = {2016}
+}
+
+% (APA 11.6 Example 18)
+ at LEGMATERIAL{11.6:18,
+ SOURCE = {houseofrepresentatives},
+ TYPE = {report},
+ NUMBER = {114-358},
+ URL = {https://www.gpo.gov/fdsys/pkg/CRPT-114rpt358/pdf/CRPT-114hrpt358.pdf},
+ DATE = {2015}
+}
+
+% (APA 11.7 Example 19)
+ at LEGADMINMATERIAL{11.7:19,
+ TITLE = {Protection of Human Subjects},
+ CITATION = {45 C.F.R. § 46},
+ URL = {https://www.hhs.gov/ohrp/sites/default/files/ohrp/policy/ohrpregulations.pdf},
+ DATE = {2009}
+}
+
+% (APA 11.7 Example 20)
+% Note the use of SHORTTITLE to use a shortened title in citations
+ at LEGADMINMATERIAL{11.7:20,
+ TITLE = {Defining and Delimiting the Exemptions for
+ Executive, Administrative, Professional, Outside
+ Sales and Computer Employees},
+ SHORTTITLE = {Defining and Delimiting},
+ CITATION = {81 F.R. 32391},
+ URL = {https://www.federalregister.gov/articles/2016/05/23/2016-11754/defining-and-delimiting-the-exemptions-for-executive-administrative-professional-outside-sales-and},
+ NOTE = {to be codified at 29 C.F.R. § 541},
+ KEYWORDS = {proposed},
+ DATE = {2016-05-23}
+}
+
+% (APA 11.7 Example 21)
+ at LEGADMINMATERIAL{11.7:21,
+ TYPE = {execorder},
+ NUMBER = {13,676},
+ CITATION = {3 C.F.R. 294},
+ URL = {https://www.govinfo.gov/content/pkg/CFR-2015-title3-vol1/pdf/CFR-2015-title3-vol1-eo13676.pdf},
+ DATE = {2014}
+}
+
% (APA 11.8 Example 22)
@PATENT{11.8:22,
AUTHOR = {S. C. Hiremath and S. Kumar and F. Lu and A Salehi},
@@ -2428,3 +2643,59 @@
DATE = {2016}
}
+% (APA 11.9 Example 23)
+ at CONSTITUTION{11.9:23,
+ SOURCE = {us},
+ TYPE = {constitution},
+ ARTICLE = {I},
+ SECTION = {3}
+}
+
+% (APA 11.9 Example 24)
+ at CONSTITUTION{11.9:24,
+ SOURCE = {southcarolina},
+ TYPE = {constitution},
+ ARTICLE = {IX},
+ SECTION = {3}
+}
+
+% (APA 11.9 Example 25)
+ at CONSTITUTION{11.9:25,
+ SOURCE = {us},
+ TYPE = {constitution},
+ AMENDMENT = {XIX}
+}
+
+% (APA 11.9 Example 26)
+% Use KEYWORD "repealed" (which is a localised string) and EVENTDATE for the date of repeal
+ at CONSTITUTION{11.9:26,
+ SOURCE = {us},
+ TYPE = {constitution},
+ AMENDMENT = {XIX},
+ KEYWORDS = {repealed},
+ EVENTDATE = {1933}
+}
+
+% (APA 11.9 Example 27)
+ at CONSTITUTION{11.9:27,
+ SOURCE = {us},
+ TYPE = {constitution},
+ AMENDMENT = {I--X}
+}
+
+% (APA 11.9 Example 28)
+% Use PART for paragraph
+ at CONSTITUTION{11.9:28,
+ SOURCE = {unitednations},
+ TYPE = {charter},
+ ARTICLE = {1},
+ PART = {3}
+}
+
+% (APA 11.10 Example 29)
+ at LEGAL{11.10:29,
+ TITLE = {United Nations Convention on the Rights of the Child},
+ DATE = {1989-11-20},
+ URL = {https://www.ohchr.org/en/professionalinterest/pages/crc.aspx}
+}
+
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2019-11-27 22:04:35 UTC (rev 52945)
@@ -994,8 +994,120 @@
\printbibliography[title={APA 10.16 References}]
\end{refsection}
+\newpage
+\subsection{APA 11.4--Cases or Court Decisions}
+\begin{refsection}
+
+\noindent\apa{11.4 Example 1}\\
+\apaex{\parencite{11.4:1}}\\
+\apaex{\textcite{11.4:1}}
+
+\noindent\apa{11.4 Example 2}\\
+\apaex{\parencite{11.4:2}}\\
+\apaex{\textcite{11.4:2}}
+
+\noindent\apa{11.4 Example 3}\\
+\apaex{\parencite{11.4:3}}\\
+\apaex{\textcite{11.4:3}}
+
+\noindent\apa{11.4 Example 4}\\
+\apaex{\parencite{11.4:4}}\\
+\apaex{\textcite{11.4:4}}
+
+\noindent\apa{11.4 Example 5}\\
+\apaex{\parencite{11.4:5}}\\
+\apaex{\textcite{11.4:5}}
+
+\noindent\apa{11.4 Example 6}\\
+\apaex{\parencite{11.4:6}}\\
+\apaex{\textcite{11.4:6}}
+
+\noindent\apa{11.4 Example 7}\\
+\apaex{\parencite{11.4:7}}\\
+\apaex{\textcite{11.4:7}}
+
+\printbibliography[title={APA 11.4 References}]
+\end{refsection}
\newpage
+\subsection{APA 11.5--Statues (Laws and Acts)}
+
+\begin{refsection}
+
+\noindent\apa{11.5 Example 8}\\
+\apaex{\parencite{11.5:8}}\\
+\apaex{\textcite{11.5:8}}
+
+\noindent\apa{11.5 Example 9}\\
+\apaex{\parencite{11.5:9}}\\
+\apaex{\textcite{11.5:9}}
+
+\noindent\apa{11.5 Example 10}\\
+\apaex{\parencite{11.5:10}}\\
+\apaex{\textcite{11.5:10}}
+
+\noindent\apa{11.5 Example 11}\\
+\apaex{\parencite{11.5:11}}\\
+\apaex{\textcite{11.5:11}}
+
+\noindent\apa{11.5 Example 12}\\
+\apaex{\parencite{11.5:12}}\\
+\apaex{\textcite{11.5:12}}
+
+\noindent\apa{11.5 Example 13}\\
+\apaex{\parencite{11.5:13}}\\
+\apaex{\textcite{11.5:13}}
+
+\printbibliography[title={APA 11.5 References}]
+\end{refsection}
+\newpage
+\subsection{APA 11.6--Legislative Materials}
+
+\begin{refsection}
+
+\noindent\apa{11.6 Example 14}\\
+\apaex{\parencite{11.6:14}}\\
+\apaex{\textcite{11.6:14}}
+
+\noindent\apa{11.6 Example 15}\\
+\apaex{\parencite{11.6:15}}\\
+\apaex{\textcite{11.6:15}}
+
+\noindent\apa{11.6 Example 16}\\
+\apaex{\parencite{11.6:16}}\\
+\apaex{\textcite{11.6:16}}
+
+\noindent\apa{11.6 Example 17}\\
+\apaex{\parencite{11.6:17}}\\
+\apaex{\textcite{11.6:17}}
+
+\noindent\apa{11.6 Example 18}\\
+\apaex{\parencite{11.6:18}}\\
+\apaex{\textcite{11.6:18}}
+
+\printbibliography[title={APA 11.6 References}]
+\end{refsection}
+\newpage
+\subsection{APA 11.7--Administrative and Executive Materials}
+
+\begin{refsection}
+
+\noindent\apa{11.7 Example 19}\\
+\apaex{\parencite{11.7:19}}\\
+\apaex{\textcite{11.7:19}}
+
+\noindent\apa{11.7 Example 20}\\
+\apaex{\parencite{11.7:20}}\\
+\apaex{\textcite{11.7:20}}
+
+\noindent\apa{11.7 Example 21}\\
+\apaex{\parencite{11.7:21}}\\
+\apaex{\textcite{11.7:21}}
+
+
+\printbibliography[title={APA 11.7 References}]
+\end{refsection}
+\newpage
\subsection{APA 11.8--Patents}
\begin{refsection}
@@ -1006,6 +1118,48 @@
\printbibliography[title={APA 11.8 References}]
\end{refsection}
+\newpage
+\subsection{APA 11.9--Constitutions and Charters}
+\begin{refsection}
+
+\noindent\apa{11.9 Example 23}\\
+\apaex{\parencite{11.9:23}}\\
+\apaex{\textcite{11.9:23}}
+
+\noindent\apa{11.9 Example 24}\\
+\apaex{\parencite{11.9:24}}\\
+\apaex{\textcite{11.9:24}}
+
+\noindent\apa{11.9 Example 25}\\
+\apaex{\parencite{11.9:25}}\\
+\apaex{\textcite{11.9:25}}
+
+\noindent\apa{11.9 Example 26}\\
+\apaex{\parencite{11.9:26}}\\
+\apaex{\textcite{11.9:26}}
+
+\noindent\apa{11.9 Example 27}\\
+\apaex{\parencite{11.9:27}}\\
+\apaex{\textcite{11.9:27}}
+
+\noindent\apa{11.9 Example 28}\\
+\apaex{\parencite{11.9:28}}\\
+\apaex{\textcite{11.9:28}}
+
+\printbibliography[title={APA 11.9 References}]
+\end{refsection}
+\newpage
+\subsection{APA 11.10--Treaties and International Conventions}
+
+\begin{refsection}
+
+\noindent\apa{11.10 Example 29}\\
+\apaex{\parencite{11.10:29}}\\
+\apaex{\textcite{11.10:29}}
+
+\printbibliography[title={APA 11.9 References}]
+\end{refsection}
+
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2019-11-27 22:04:35 UTC (rev 52945)
@@ -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.0},
+ revision={9.1},
date={\today}}
\hypersetup{%
@@ -67,8 +67,8 @@
\subsection{About}
This package is a Bib\LaTeX\ style for APA (American Psychological
-Association) style compliant documents typeset in \latex. It implements a
-citation style (\file{apa.cbx}), a references section style
+Association) 7th Edition style compliant documents typeset in \latex. It
+implements a citation style (\file{apa.cbx}), a references section style
(\file{apa.bbx}), some data model enhancements (\file{apa.dbx}) and string
localisation files (\path{<language>-apa.lbx}). The style is loaded just
like any other Bib\LaTeX\ styles but don't try to use the citation and
@@ -75,6 +75,9 @@
references styles separately as they rely on each other, macro-wise, in
places.
+Please see the package |biblatex-apa6| on CTAN for the APA 6th edition
+conformant version of this style.
+
In general, there is no attempt to generalise this style for non-APA
requirements--it is written for APA compliance only. Having said that,
there are a few options which allow users to change the APA defaults.
@@ -179,19 +182,7 @@
\subsection{Package options}\label{opts}
-The following options are set as usual in the options passed to
-|biblatex|.
-
\begin{ltxcode}
-apabackref=true|false
-\end{ltxcode}%|
-
-\noindent It is not APA style to include backreferences in the References to
-pages where citations of the entry occur. However, this is very
-useful, especially in proofing and so if you set the |apabackref|
-option to «true», these are enabled. The default is «false».
-
-\begin{ltxcode}
apamaxprtauth=<num>
\end{ltxcode}
@@ -198,7 +189,7 @@
\noindent This option controls the number of author/editor names which are
printed in the References. APA style defaults to 20. You can change this if
you really want to fully print all author list references in certain
-contexts (for example in a CV where you are an author in position 21 \ldots)
+contexts (for example in a CV where you are an author in position 21 \ldots).
\subsection{Localisation}
@@ -237,17 +228,6 @@
date of a URL and the URL itself. This defaults to the standard comma and
space as per APA style but just a space in germanic localisations.
-\subsection{Limitations}
-\label{use:limit}
-There are certain limitations you need to bear in mind when using these
-styles. The APA manual is written without much regard for automation of
-citation and references processing---it just tells you how it wants things to
-look and the implicit assumption is that you would type out everything by
-hand if necessary. Having said that, the majority of the APA citation
-and references style is implemented, there are just a few exceptions which
-are hardly worth the coding pain since they are ambiguous and easily worked
-around.
-
\section{Details}
The detailed information for this style is contained in the example document and
@@ -257,7 +237,7 @@
\item[\path{biblatex-apa-test.tex}]\footnote{\path{biblatex-apa-test.pdf}
is also provided and is the typeset version of this \latex source
file.} This document typesets every useful example from
- \apa{8}--\apa{10}. The examples in it aim to look as much like the APA
+ \apa{8--10}. The examples in it aim to look as much like the APA
manual examples as possible. All citation examples in the document are
real examples using a \path{.bib} file.
\item[\path{biblatex-apa-test-citations.bib}] This contains the \path{.bib}
@@ -265,10 +245,10 @@
in this file---it's just used to provide real data for the citation
examples.
\item[\path{biblatex-apa-test-references.bib}] This contains the
- \path{.bib} entries for all of the examples in \apa{9} and \apa{10}. This
+ \path{.bib} entries for all of the examples in \apa{9--11}. This
file is the main documentation for the |biblatex-apa| implementation of
the APA References section style. To see how the style deals with a
- particular example from \apa{9} or \apa{10}, look it up in here. Every
+ particular example from \apa{9--11}, look it up in here. Every
example is marked with the APA example number and has explanatory notes
where necessary.
\item[\path{apa.cbx}] The |biblatex-apa| citations style. It is
@@ -388,11 +368,37 @@
non-academic articles. This is a more general solution than introducing new
entry types which are not supported by other software.
+\subsubsection{Legal Entry Types}
+
+\apa{11} contains the format guidelines for legal references. This is fully
+implemented and the |biblatex-apa-test-references.bib| demonstrates which
+entry types and fields are used to produce the \apa{11} examples. There are
+some custom entry types and fields used to manage this, as you will see in
+the |.bib| file. Considerable use is made of localisation strings in legal
+entries due to the requirements that certain strings change their
+abbreviation status between citations and references (and even between
+parenthetical and narrative citations).
+
+The localisation strings for the U.S. specific elements of this section
+(most of it) are not provided in other languages as there is not much
+point. Feel free to copy them from |american-apa.lbx| if you really need
+to. Localisation strings for all 50 U.S. States are provided to support
+state constitution references.
+
+Pay attention to the |JURISDICTION| entries in the example |.bib| which use
+|biber|'s data annotation feature in order to match the required style
+elements. The names of the data annotations are not optional and must match
+the examples.
+
\section{Revision history}\label{rev}
\begin{changelog}
-\begin{release}{9.0}{2019-}
+\begin{release}{9.1}{2019-11-27}
+\item Bug fixes, internal improvements and implementation of \apa{11}.
+\end{release}
+
+\begin{release}{9.0}{2019-11-23}
\item First release (of APA 7th edition style)
\end{release}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{american}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,92 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{section}
+\NewBibliographyString{amendment}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\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 = {american},
- article = {{article}{article}},
+ ofthe = {{of\space the}{of\space the}},
+ tothe = {{to\space the}{to\space the}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{charter}{charter}},
+ proposed = {{proposed}{proposed}},
+ repealed = {{was repealed in}{repealed}},
+ 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 = {{Section}{§}},
+ amendment = {{amendment}{amend\adddot}},
+ article = {{article}{art\adddot}},
painting = {{painting}{painting}},
present = {{present}{present}},
song = {{song}{song}},
@@ -99,10 +178,7 @@
with = {{with}{with}},
reprintas = {{reprinted as}{reprinted as}},
reprintfrom = {{reprinted from}{reprinted from}},
- commentonarticle = {{comment\space on\space the\space article}{comment\space on\space the\space article}},
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
+ commenton = {{comment\space on}{comment\space on}},
part = {{part}{pt\adddot}},
paragraph = {{paragraph}{para\adddot}},
paragraphs = {{paragraphs}{paras\adddot}},
@@ -136,7 +212,57 @@
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}},
+ 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}}}
}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2019/11/23\space v9.0\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2019/11/27\space v9.1\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -98,7 +98,16 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Multiple related entries, even though there are no
+% examples in APA 7th, should probably be this
+
+\renewcommand*{\relateddelim}{\addcomma\addspace}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Force roman numerals into arabic using
% etoolbox macros
@@ -123,7 +132,10 @@
\blx at metadateinfo{#1}%
\iffieldundef{#1year}{}
{\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+ \ifboolexpr{ test {\ifstrequal{#1}{url}}
+ or test {\ifentrytype{legal}}
+ or ( test {\ifentrytype{legadminmaterial}} and
+ test {\ifkeyword{proposed}} ) }
{\printtext{%
\mkbibdateapalongmdy{#1year}{#1month}{#1day}%
\iffieldundef{#1endyear}%
@@ -259,10 +271,13 @@
\literal{nodate}
}
+% CONSTITUTION entrytypes have no dates at all so no fall back to nodate literal either
+\DeclareLabeldate[constitution]{\field{date}}
+
\ExecuteBibliographyOptions{%
abbreviate=true,%
autocite=inline,%
- backref=true,%
+ backref=false,%
citetracker=true,%
date=apalong,%
dateabbrev=false,%
@@ -317,19 +332,6 @@
}
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% It is not APA standard to have backrefs in the bib
-% Some users might like it though.
-
-\newbool{apa:backref}
-\DeclareBibliographyOption{apabackref}{%
- \ifstrequal{#1}{true}
- {\global\booltrue{apa:backref}}
- {\global\boolfalse{apa:backref}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Flag to say whether the "in" has
% been placed already in IN*
@@ -352,27 +354,23 @@
\ifbibstring{#1}{\bibcpstring{#1}}{#1}}}
% TITLE
-\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
-\DeclareFieldFormat[article]{title}{#1\isdot}
-\DeclareFieldFormat[inbook]{title}{#1\isdot}
-\DeclareFieldFormat[incollection]{title}{#1\isdot}
-\DeclareFieldFormat[inproceedings]{title}{\mkbibemph{#1}\isdot}
-\DeclareFieldFormat[proceedings]{title}{\mkbibemph{#1}\isdot}
-\DeclareFieldFormat[periodical]{title}{#1\isdot}
-\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[image]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[misc]{title}{#1\isdot}
-\DeclareFieldFormat[audio]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
-\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
+\DeclareFieldFormat*{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[article,inbook,incollection,periodical,misc,legislation,legadminmaterial,jurisdiction,inproceedings,legal]{title}{#1\isdot}
+\DeclareFieldFormat[audio,video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
+% SUBTITLE
+\DeclareFieldFormat[legmaterial]{subtitle}{\mkbibemph{#1}}
+
% TITLEADDON
\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat[legislation]{titleaddon}{#1}
% MAINTITLEADDON
\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
+% NOTE
+\DeclareFieldFormat[legmaterial,legadminmaterial]{note}{\mkbibparens{#1}}
+
% BOOKTITLEADDON
\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
@@ -382,12 +380,9 @@
% ORIGTITLE
\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx at colon@search\MakeSentenceCase*{#1}}\isdot}
-\DeclareFieldFormat[article]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[inbook]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[incollection]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[inproceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[proceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[article,inbook,incollection,inproceedings,proceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+
% VOLUME
\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
{\bibcpstring{volume}~\apanum{#1}}
@@ -409,25 +404,35 @@
{\apanum{#1}}}
{\mkbibemph{\apanum{#1}}}}
\DeclareFieldFormat[report]{number}{\apanum{#1}}
-\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareFieldFormat[article,periodical]{number}{\mkbibparens{\apanum{#1}}}
\DeclareFieldFormat[reprint]{number}{\mkbibbrackets{\apanum{#1}}}
-\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareFieldFormat{legmaterialnum}{%
+ \ifthenelse{%
+ \iffieldequalstr{type}{report}\OR%
+ \iffieldequalstr{type}{execorder}}{\bibcpstring{number}~\apanum{#1}}{\apanum{#1}}}
+
% PAGES
-\DeclareFieldFormat[inbook]{pages}{\mkpageprefix[bookpagination]{#1}}
-\DeclareFieldFormat[incollection]{pages}{\mkpageprefix[bookpagination]{#1}}
+\DeclareFieldFormat[inbook,incollection]{pages}{\mkpageprefix[bookpagination]{#1}}
\DeclareFieldFormat[periodical]{pages}{#1}
+% PART
+\DeclareFieldFormat*{part}{#1}
+
% LOCATION
-\DeclareListFormat[misc]{location}{\mkbibemph{#1}}
-\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
+\DeclareListFormat[misc,periodical]{location}{\mkbibemph{#1}}
+\DeclareListFormat{publisher}{%
+ \usebibmacro{publisher:delim}{#1}%
+ #1\isdot}
+\DeclareListFormat{location}{%
+ \usebibmacro{location:delim}{#1}%
+ #1\isdot}
% NAMEADDON
\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}}
% VERSION
-\DeclareFieldFormat[dataset]{version}{\bibcpstring{version}~#1}
-\DeclareFieldFormat[software]{version}{\bibcpstring{version}~#1}
+\DeclareFieldFormat[dataset,software]{version}{\bibcpstring{version}~#1}
% URL
\DeclareFieldFormat{url}{\url{#1}}
@@ -529,6 +534,17 @@
\newunit\newblock%
\usebibmacro{labelyear+extradate}}
+\newbibmacro*{author/editor:related}{%
+ \ifthenelse{\ifnameundef{author}\AND\ifnameundef{groupauthor}}
+ {\ifnameundef{editor}
+ {\usebibmacro{title}%
+ % need to clear all title fields so we don't get them again later
+ \clearfield{title}%
+ \clearfield{subtitle}%
+ \clearfield{titleaddon}}
+ {\usebibmacro{editorinauthpos:related}}}
+ {\usebibmacro{author:related}}}
+
\newbibmacro*{editorinauthpos}{%
\printnames[apaauthor][-\value{listtotal}]{editor}%
\setunit{\addspace}%
@@ -538,6 +554,15 @@
% need to clear editor so we don't get an "In" clause later
\clearname{editor}}}
+\newbibmacro*{editorinauthpos:related}{%
+ \printnames[apanames][-\value{listtotal}]{editor}%
+ \setunit{\addspace}%
+ \ifnameundef{editor}
+ {}
+ {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}%
+ % need to clear editor so we don't get an "In" clause later
+ \clearname{editor}}}
+
\renewbibmacro*{author}{%
\ifnameundef{author}
{\printnames[apaauthor][-\value{listtotal}]{groupauthor}}
@@ -550,6 +575,12 @@
\printnames[apaauthor][-\value{listtotal}]{with}}
\setunit*{\addspace}}}
+\newbibmacro*{author:related}{%
+ \ifnameundef{author}
+ {\printnames[apanames][-\value{listtotal}]{groupauthor}}
+ {\printnames[apanames][-\value{listtotal}]{author}}%
+ \setunit*{\addspace}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -650,17 +681,6 @@
\setunit{\addspace}%
\ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
\setunit{\addspace}%
- \iffieldundef{related}
- {}
- {\ifthenelse{\iffieldequalstr{relatedtype}{reviewofbook}\OR%
- \iffieldequalstr{relatedtype}{reviewoffilm}\OR%
- \iffieldequalstr{relatedtype}{reviewoftv}\OR%
- \iffieldequalstr{relatedtype}{commentonarticle}}
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- \togglefalse{bbx:related}}% disable default related expansion later on
- {}}%
- \setunit{\addspace}%
\printfield{titleaddon}%
\setunit{\addspace}%
\usebibmacro{addinfo2}}}%
@@ -725,7 +745,7 @@
\iffieldundef{eprinttype}
{}
{\printtext{%
- \iffieldbibstring{eprinttype}{\bibcpstring{\strfield{eprinttype}}}{\strfield{eprinttype}}%
+ \iffieldbibstring{eprinttype}{\bibcplstring{\strfield{eprinttype}}}{\strfield{eprinttype}}%
\setunit{\addspace}}}%
\printfield{eprint}}
@@ -1100,10 +1120,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 10.2.24) Multiple publishers, semi-colon sep
-\DeclareListFormat{publisher}{%
- \usebibmacro{publisher:delim}{#1}%
- #1\isdot}
-
\newbibmacro*{publisher:delim}[1]{%
\ifnumgreater{\value{listcount}}{\value{liststart}}
{\printdelim[publisher]{multilistdelim}}
@@ -1132,10 +1148,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 10.1 Example 18) Comment on article
-\newcommand*{\begrelateddelimcommentonarticle}{\addspace}
-\DeclareFieldFormat{related:commentonarticle}{\def\bibstring{\blx at imc@bibcpstring}\mkbibbrackets{#1}}
+\newcommand*{\begrelateddelimcommenton}{\addspace}
+\DeclareFieldFormat{related:commenton}{\def\bibstring{\blx at imc@bibcpstring}\mkbibbrackets{#1}}
-\renewbibmacro*{related:commentonarticle}[1]{%
+\newbibmacro*{related:commenton}[1]{%
\entrydata*{#1}{%
\printtext{\mkbibquote{\printfield[apacase]{title}}}}}
@@ -1146,24 +1162,15 @@
% (APA 10.7) Reviews - role strings need to be the
% short versions in reviews
-\newcommand*{\begrelateddelimreviewofbook}{\addspace}
-\DeclareFieldFormat{related:reviewofbook}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
-\newbibmacro*{related:reviewofbook}[1]{\usebibmacro{related:reviewofx}{#1}}
-
-\newcommand*{\begrelateddelimreviewoffilm}{\addspace}
-\DeclareFieldFormat{related:reviewoffilm}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
-\newbibmacro*{related:reviewoffilm}[1]{\usebibmacro{related:reviewofx}{#1}}
-
-\newcommand*{\begrelateddelimreviewoftv}{\addspace}
-\DeclareFieldFormat{related:reviewoftv}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
-\newbibmacro*{related:reviewoftv}[1]{\usebibmacro{related:reviewofx}{#1}}
-
\DeclareFieldFormat{reviewtitle}{%
\iffieldequalstr{entrysubtype}{tvepisode}
{\mkbibquote{\bbx at colon@search\MakeSentenceCase*{#1}}}
{\bbx at colon@search\MakeSentenceCase*{#1}}}
-\newbibmacro*{related:reviewofx}[1]{%
+\newcommand*{\begrelateddelimreviewof}{\addspace}
+\DeclareFieldFormat{related:reviewof}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
+
+\newbibmacro*{related:reviewof}[1]{%
\entrydata*{#1}{%
\printtext{\mkbibemph{%
\printfield[reviewtitle]{title}%
@@ -1174,7 +1181,7 @@
\setunit{\addcomma\addspace}%
\biblstring{byauthor}%
\setunit{\addspace}%
- \printnames[apanames][-\value{listtotal}]{author}}}}
+ \usebibmacro{author/editor:related}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1219,8 +1226,20 @@
{}}
\newcommand*{\begrelateddelimreprintfrom}{\addperiod\addspace}
+
+% Some APA related entries are just after title, some are at the end of
+% the entry. This is for those after the title
+\newbibmacro*{apa:related}{%
+ \iffieldundef{related}
+ {}
+ {\ifthenelse{\iffieldequalstr{relatedtype}{reviewof}\OR%
+ \iffieldequalstr{relatedtype}{commenton}}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ \togglefalse{bbx:related}}% disable default related expansion later on
+ {}}}
+
\DeclareFieldFormat{related:reprintfrom}{\let\bibstring\bibcpstring\mkbibparens{#1}}
-\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
\renewbibmacro*{related:reprintfrom}[1]{%
\entrydata*{#1}{%
@@ -1294,7 +1313,76 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 11.4) Court cases
+
+\newtoggle{apa:courtdate}
+
+\DeclareListFormat{citation}{%
+ \global\toggletrue{apa:courtdate}%
+ \hasitemannotation[\currentlist][citeorg]%
+ {#1\addspace\mkbibparens{\getitemannotation[\currentlist][citeorg]%
+ \hasitemannotation[\currentlist][citedate]
+ {\addspace\getitemannotation[\currentlist][citedate]%
+ \global\togglefalse{apa:courtdate}} % disable normal date printing if it's in the citation info
+ {}}}
+ {\ifitemannotation[\currentlist][citeinfo]{appeal}
+ {\mkbibemph{#1}}
+ {#1}}%
+ \ifthenelse{\value{listcount}<\value{liststop}}
+ {\addcomma\addspace}
+ {}}
+
+\DeclareFieldFormat{courtdate}{%
+ % disable normal date printing if it's in the citation info
+ \iftoggle{apa:courtdate}
+ {\iflistundef{organization}
+ {\printtext{\mkbibparens{#1}}}
+ {\printtext{\mkbibparens{%
+ \printlist{organization}\space #1}}}}
+ {}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 11.5) Statutes
+
+\newbibmacro*{statdate}{%
+ \iffieldundef{origyear}
+ {\printtext[parens]{\printlabeldate}}
+ {\printtext[parens]{\printorigdate%
+ \addspace\&\addspace rev\adddot\addspace\printlabeldate}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 11.6) Legislative Material and Admin Material
+
+\newbibmacro*{location:delim}[1]{%
+ \ifnumgreater{\value{listcount}}{\value{liststart}}
+ {\printdelim[location]{multilistdelim}}
+ {}}
+
+\DeclareDelimFormat[location]{multilistdelim}{\addcomma\space}
+\DeclareDelimFormat[location]{finallistdelim}{\addcomma\space}
+
+\newbibmacro*{legmattitle}{%
+ \iffieldundef{title}
+ {\bibcpsstring{\thefield{source}}%
+ \setunit*{\addspace}%
+ \bibcpsstring{\thefield{type}}%
+ \setunit*{\addspace}%
+ \printfield[legmaterialnum]{number}}
+ {\printfield{title}%
+ \setunit*{\addcolon\addspace}\newblock
+ \printfield{subtitle}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 10.x) General entrytype drivers
% Custom driver to make a cleaner example for 9.44
@@ -1309,6 +1397,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{journal+issuetitle}%
\setunit{\bibpagespunct}%
@@ -1326,7 +1416,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1336,6 +1426,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{mainaudio}%
\newunit\newblock
@@ -1351,7 +1443,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1374,10 +1466,31 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{constitution}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \bibcpsstring{\thefield{source}}%
+ \setunit{\addspace}\newblock
+ \bibcpsstring{\thefield{type}}%
+ \setunit{\addspace}\newblock
+ \iffieldundef{amendment}{}{\bibsstring{amendment}\setunit{\addspace}\printfield{amendment}}%
+ \setunit{\addcomma\addspace}\newblock
+ \iffieldundef{article}{}{\bibsstring{article}\setunit{\addspace}\printfield{article}}%
+ \setunit{\addcomma\addspace}\newblock
+ \iffieldundef{section}{}{\bibsstring{section}\setunit{\addspace}\printfield{section}}%
+ \setunit{\addcomma\addspace}\newblock
+ \iffieldundef{part}{}{\bibsstring{paragraph}\setunit{\addspace}\printfield{part}}%
+ \setunit{\addspace}\newblock
+ \ifkeyword{repealed}{\printtext[parens]{\biblcsstring{repealed}\setunit{\addspace}\printeventdate}}{}%
+ \usebibmacro{doi+url}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{dataset}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -1403,7 +1516,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1424,7 +1537,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1434,6 +1547,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{editor+trans}%
\newblock
@@ -1453,7 +1568,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1463,6 +1578,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
@@ -1482,7 +1599,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1492,6 +1609,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
@@ -1518,10 +1637,86 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{jurisdiction}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \printfield{title}%
+ \setunit{\addcomma\addspace}\newblock
+ \printlist{citation}%
+ \setunit{\addspace}\newblock
+ \printtext[courtdate]{\printlabeldate}%
+ \newunit\newblock
+ \usebibmacro{doi+url}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{legal}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \printfield{title}%
+ \setunit{\addspace}%
+ \printfield{titleaddon}%
+ \setunit{\addcomma\addspace}\newblock
+ \printlabeldate%
+ \setunit{\addcomma\addspace}\newblock
+ \usebibmacro{doi+url}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{legislation}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \printfield{title}%
+ \setunit{\addspace}%
+ \printfield{titleaddon}%
+ \setunit{\addcomma\addspace}\newblock
+ \printlist{location}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{statdate}%
+ \newunit\newblock
+ \usebibmacro{doi+url}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{legadminmaterial}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{legmattitle}%
+ \setunit{\addcomma\addspace}\newblock
+ \printlist{citation}%
+ \setunit{\addspace}\newblock
+ \printtext[parens]{\ifkeyword{proposed}{\bibstring{proposed}\space}{}\printlabeldate}%
+ \setunit{\addspace}\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{doi+url}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{legmaterial}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{legmattitle}%
+ \setunit{\addcomma\addspace}\newblock
+ \printlist{location}%
+ \setunit{\addspace}\newblock
+ \printtext[parens]{\printlabeldate}%
+ \setunit{\addspace}\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{doi+url}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{manual}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -1547,7 +1742,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1557,6 +1752,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
@@ -1568,7 +1765,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1578,6 +1775,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\printlist{organization}%
\addperiod\addspace
@@ -1590,7 +1789,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1600,6 +1799,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
@@ -1613,7 +1814,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{periodical}{%
@@ -1641,7 +1842,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1651,6 +1852,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{eventinfo}%
\setunit{\addcomma\addspace}%
@@ -1674,7 +1877,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1684,6 +1887,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\printlist{institution}%
\newunit\newblock
@@ -1699,7 +1904,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1721,7 +1926,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1746,7 +1951,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1756,6 +1961,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\setunit{\addspace}%
\printfield{howpublished}%
\newunit\newblock
@@ -1773,7 +1980,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1783,6 +1990,8 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
\newunit\newblock
\usebibmacro{mainvideo}%
\newunit\newblock
@@ -1796,7 +2005,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:pageref}%
+ \usebibmacro{pageref}%
\usebibmacro{annotation}%
\usebibmacro{finentry}}
@@ -1878,15 +2087,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Wrapper for backrefs
-
-\newbibmacro{apa:pageref}{%
- \ifbool{apa:backref}{\usebibmacro{pageref}}{}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Unchanged from authoryear-comp
\DeclareBibliographyOption{dashed}[true]{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2019/11/23\space v9.0\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2019/11/27\space v9.1\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -43,27 +43,33 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 8.17) ampersand separator in parenthetical cites
+\newtoggle{apa:inpcite}
+
\DeclareDelimFormat[parencite]{finalnamedelim}
{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
\DeclareCiteCommand{\parencite}[\mkbibparens]
{\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ \usebibmacro{prenote}%
+ \toggletrue{apa:inpcite}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}%
\usebibmacro{cite:post}}
{}
- {\usebibmacro{postnote}}
+ {\usebibmacro{postnote}%
+ \togglefalse{apa:inpcite}}
\DeclareCiteCommand*{\parencite}[\mkbibparens]
{\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ \usebibmacro{prenote}%
+ \toggletrue{apa:inpcite}}
{\usebibmacro{citeindex}%
\usebibmacro{citeyear}%
- \usebibmacro{cite:post}}
+ \usebibmacro{cite:post}%
+ \togglefalse{apa:inpcite}}
{}
{\usebibmacro{postnote}}
@@ -288,18 +294,83 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 8.14) Fall back to title for citations without authors
+% (APA 11) Bizarre and special rules for legal information
\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[book,manual,report,preiodical,legmaterial,jurisdiction]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[legislation,legadminmaterial,legal]{citetitle}{#1}
\newbibmacro*{cite:noname}{%
- \printfield[citetitle]{labeltitle}}
+ \iffieldundef{labeltitle}
+ {\ifthenelse{\ifentrytype{legmaterial}\OR%
+ \ifentrytype{legadminmaterial}}
+ {\let\blx at tempa\bibcplstring% \textcite default
+ \let\blx at tempb\bibcplstring% \textcite default
+ \iftoggle{apa:inpcite}
+ {\iffieldequalstr{type}{execorder}{\let\blx at tempb\bibcpsstring}{}%
+ \iffieldequalstr{type}{resolution}{\let\blx at tempa\bibcpsstring}{}%
+ \iffieldequalstr{type}{report}{\let\blx at tempa\bibcpsstring\let\blx at tempb\bibcpsstring}{}}
+ {}%
+ \iffieldundef{source}{}{\blx at tempa{\thefield{source}}}%
+ \setunit{\addspace}%
+ \iffieldundef{type}{}{\blx at tempb{\thefield{type}}}%
+ \setunit{\addspace}%
+ \printfield[legmaterialnum]{number}}
+ {\ifentrytype{constitution}{\usebibmacro{cite:noname:const}}{}}}
+ {\printfield[citetitle]{labeltitle}}}
+% CONSTITUTION entrytypes are messier
+\newbibmacro*{cite:noname:const}{%
+ \iftoggle{apa:inpcite}
+ {\bibcpsstring{\thefield{source}}%
+ \setunit{\addspace}%
+ \bibcpsstring{\thefield{type}}%
+ \setunit{\addspace}%
+ \iffieldundef{amendment}{}{\bibsstring{amendment}%
+ \setunit{\addspace}%
+ \printfield{amendment}%
+ \setunit{\addcomma\addspace}%
+ \ifkeyword{repealed}
+ {\biblcsstring{repealed}%
+ \setunit{\addspace}%
+ \printeventdate}
+ {}}%
+ \setunit{\addspace}%
+ \iffieldundef{article}{}{\bibsstring{article}\setunit{\addspace}\printfield{article}}%
+ \setunit{\addcomma\addspace}\newblock
+ \iffieldundef{section}{}{\bibsstring{section}\setunit{\addspace}\printfield{section}}%
+ \setunit{\addcomma\addspace}\newblock
+ \iffieldundef{part}{}{\bibsstring{paragraph}\setunit{\addspace}\printfield{part}}}
+ {}%
+ \iftoggle{apa:intcite}
+ {\iffieldundef{amendment}{}{\bibcplstring{amendment}%
+ \setunit{\addspace}%
+ \printfield{amendment}%
+ \setunit{\addspace}%
+ \biblcsstring{tothe}}%
+ \iffieldundef{article}{}{\bibcplstring{article}\setunit{\addspace}\printfield{article}}%
+ \setunit{\addcomma\addspace}%
+ \iffieldundef{part}{}{\biblstring{paragraph}%
+ \setunit{\addspace}%
+ \printfield{part}%
+ \setunit{\addcomma\addspace}%
+ \biblcsstring{ofthe}}%
+ \setunit{\addcomma\addspace}%
+ \iffieldundef{section}{}{\bibcplstring{section}%
+ \setunit{\addspace}%
+ \printfield{section}%
+ \setunit{\addcomma\addspace}%
+ \biblcsstring{ofthe}}
+ \setunit{\addspace}%
+ \bibcplstring{\thefield{source}}%
+ \setunit{\addspace}%
+ \bibcplstring{\thefield{type}}%
+ \setunit{\addspace}%
+ \ifkeyword{repealed}
+ {\biblclstring{repealed}\setunit{\addspace}\printeventdate}
+ {}}
+ {}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -325,7 +396,8 @@
\DeclareDelimFormat[nptextcite]{finalnamedelim}
{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
-\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\setunit{\multicitedelim}}
+
\DeclareCiteCommand{\nptextcite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
@@ -462,14 +534,27 @@
{}
{\usebibmacro{postnote}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{\setunit{\compcitedelim}}
+\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}
+ {\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}
+ {\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
+ {\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+{\smartcite}{\setunit{\multicitedelim}}
+\newtoggle{apa:intcite}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ \usebibmacro{prenote}%
+ \toggletrue{apa:intcite}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}%
- \usebibmacro{cite:post}}
+ \usebibmacro{cite:post}%
+ \togglefalse{apa:intcite}}
{}
{\usebibmacro{textcite:postnote}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -12,10 +12,13 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2019/11/23\space v9.0\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2019/11/27\space v9.1\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
+ constitution,
+ legmaterial,
+ legadminmaterial,
nameonly}
\DeclareDatamodelFields[type=list, datatype=name]{
@@ -25,24 +28,43 @@
execdirector,
with}
+\DeclareDatamodelFields[type=list, datatype=literal]{
+ citation}
+
\DeclareDatamodelFields[type=field, datatype=literal]{
- abstractloc,
- appentry,
- urldescription}
+ source,
+ article,
+ section,
+ amendment,
+ appentry}
-\DeclareDatamodelFields[type=field, datatype=verbatim]{
- abstracturl}
-
\DeclareDatamodelEntryfields{
with,
groupauthor,
narrator,
execproducer,
- execdirector,
- abstractloc,
- abstracturl,
- urldescription}
+ execdirector}
+% APA Court cases
+\DeclareDatamodelEntryfields[jurisdiction]{
+ organization
+ citation}
+
+% Legislative material
+\DeclareDatamodelEntryfields[legmaterial]{
+ source}
+
+% Admin and Executive material
+\DeclareDatamodelEntryfields[legadminmaterial]{
+ citation,
+ source}
+
+% Constitution/charters
+\DeclareDatamodelEntryfields[constitution]{
+ article,
+ section,
+ amendment}
+
\DeclareDatamodelEntryfields[software]{
appentry}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
@@ -22,10 +22,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -64,10 +61,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {austrian},
- article = {{article}{article}},%FIXME
+ 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
@@ -93,11 +98,7 @@
part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
- commentonarticle = {{Comment\space on\space the\space article}
- {Comment\space on\space the\space article}},%FIXME
- reviewofbook = {{Review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{Review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{Review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{Comment\space on}{Comment\space on}},%FIXME
producer = {{Produzent}{Produzent}},
producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {brazilian},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
part = {{part}{pt\adddot}},%FIXME
paragraph = {{paragraph}{para\adddot}},%FIXME
paragraphs = {{paragraphs}{paras\adddot}},%FIXME
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
revisededition = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}},
on = {{em}{em}},
retrieved = {{recuperado}{recuperado}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{british}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {british},
- article = {{article}{article}},
+ tothe = {{to\space the}{to\space the}},
+ ofthe = {{of\space the}{of\space the}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{charter}{charter}},
+ article = {{article}{art\adddot}},
painting = {{painting}{painting}},
present = {{present}{present}},
song = {{song}{song}},
@@ -113,11 +118,7 @@
from = {{from}{from}},
archivedat = {{archived\space at}{archived\space at}},
reviewof = {{Review\space of}{review\space of}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
+ commenton = {{comment\space on}{comment\space on}},
with = {{with}{with}},
paragraph = {{paragraph}{para\adddot}},
paragraphs = {{paragraphs}{paras\adddot}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {danish},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {dutch},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Pagina}{{}p\adddot}},
pages = {{Pagina's}{{}pp\adddot}},
on = {{op}{op}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{english}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {american},
- article = {{article}{article}},
+ tothe = {{to\space the}{to\space the}},
+ ofthe = {{of\space the}{of\space the}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{charter}{charter}},
+ article = {{article}{art\adddot}},
painting = {{painting}{painting}},
present = {{present}{present}},
song = {{song}{song}},
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},
part = {{part}{pt\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
+ commenton = {{comment\space on}{comment\space on}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
on = {{on}{on}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{french}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {french},
- article = {{article}{article}},%FIXME
+ 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}},
song = {{song}{song}},%FIXME
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}p\adddot}},
on = {{le}{le}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -21,10 +21,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -63,10 +60,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {galician},
- article = {{article}{article}},%FIXME
+ 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
@@ -123,11 +128,7 @@
mathesis = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}},
phdthesis = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}},
revisededition = {{edici\'on\space revisada}{edici\'on\space revisada}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
host = {{host}{host}},
page = {{p\'axina}{{}p\adddot}},
pages = {{p\'axinas}{{}pp\adddot}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
@@ -22,10 +22,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -64,10 +61,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {german},
- article = {{article}{article}},%FIXME
+ 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
@@ -110,11 +115,7 @@
part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {greek},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{Αναθεωρημένη\space Έκδοση}{εκδ \adddotspace εκ\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Σελίδα}{{}σ\adddot}},
pages = {{Σελίδες}{{}σσ\adddot}},
on = {{στις}{στις}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {italian},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Pagina}{{}p\adddot}},
pages = {{Pagine}{{}pp\adddot}},
on = {{il}{il}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
@@ -22,10 +22,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -64,10 +61,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {naustrian},
- article = {{article}{article}},%FIXME
+ 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
@@ -110,11 +115,7 @@
part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
@@ -22,10 +22,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -64,10 +61,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {ngerman},
- article = {{article}{article}},%FIXME
+ 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
@@ -111,11 +116,7 @@
abstract = {{Abstract}{Abstract}},
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{auf}{auf}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {norsk},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {norwegian},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
@@ -22,10 +22,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -64,10 +61,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {nswissgerman},
- article = {{article}{article}},%FIXME
+ 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
@@ -110,11 +115,7 @@
part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {nynorsk},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {portuguese},
- article = {{article}{article}},%FIXME
+ 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
@@ -108,11 +113,7 @@
paragraph = {{paragraph}{para\adddot}},%FIXME
paragraphs = {{paragraphs}{paras\adddot}},%FIXME
revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
on = {{em}{em}},
retrieved = {{obtido}{obtido}},
available = {{dispon\'ivel}{disp.}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commento}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,10 +58,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {russian},
- article = {{article}{article}},%FIXME
+ 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
@@ -106,11 +111,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{исправленное издание}{испр\adddotspace изд\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
on = {{на}{на}},
retrieved = {{получено}{получено}},
available = {{доступно}{доступно}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
\NewBibliographyString{revisededition}
@@ -19,10 +19,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -61,6 +58,10 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\NewBibliographyString{% Month name variants used after day
datejanuary,
@@ -79,7 +80,11 @@
\DeclareBibliographyStrings{%
inherit = {slovene},
- article = {{article}{article}},%FIXME
+ 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
@@ -121,11 +126,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{dopolnjena izdaja}{dopolnjena iz\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
on = {{na}{na}},
retrieved = {{pridobljeno}{pridobljeno}},
available = {{dostopno}{dostopno}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -21,10 +21,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -63,10 +60,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {spanish},
- article = {{article}{article}},%FIXME
+ 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
@@ -123,11 +128,7 @@
mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}},
phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}},
revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{P\'agina}{{}p\adddot}},
pages = {{P\'aginas}{{}pp\adddot}},
on = {{el}{el}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
\NewBibliographyString{revisededition}
@@ -20,10 +20,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -62,10 +59,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {swedish},
- article = {{article}{article}},%FIXME
+ 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
@@ -107,11 +112,7 @@
supplement = {{supplement}{suppl\adddot}},%FIXME
part = {{part}{pt\adddot}},%FIXME
revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{sida}{{}s\adddot}},
pages = {{sidor}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2019-11-27 22:04:16 UTC (rev 52944)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2019-11-27 22:04:35 UTC (rev 52945)
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
@@ -22,10 +22,7 @@
\NewBibliographyString{reviewof}
\NewBibliographyString{with}
\NewBibliographyString{supplement}
-\NewBibliographyString{commentonarticle}
-\NewBibliographyString{reviewofbook}
-\NewBibliographyString{reviewoffilm}
-\NewBibliographyString{reviewoftv}
+\NewBibliographyString{commenton}
\NewBibliographyString{manunpub}
\NewBibliographyString{maninprep}
\NewBibliographyString{mansub}
@@ -64,10 +61,18 @@
\NewBibliographyString{present}
\NewBibliographyString{painting}
\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
\DeclareBibliographyStrings{%
inherit = {swissgerman},
- article = {{article}{article}},%FIXME
+ 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
@@ -111,11 +116,7 @@
part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
- commentonarticle = {{comment\space on\space the\space article}
- {comment\space on\space the\space article}},%FIXME
- reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
- reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
- reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ commenton = {{comment\space on}{comment\space on}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
More information about the tex-live-commits
mailing list