summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-24 03:01:47 +0000
committerNorbert Preining <norbert@preining.info>2022-06-24 03:01:47 +0000
commit1ef4c041ba74d4619dd62209ae48a2b24563954c (patch)
treeb45a2e8da583a0f219e75f9536d9696f9af2aca7 /macros/latex
parent00e67dfd87c53faeafcf0c9e66c8c2c7a410fcb8 (diff)
CTAN sync 202206240301
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/README2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx251
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx40
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx357
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib34
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib193
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdfbin223948 -> 225032 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex18
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdfbin66825 -> 67413 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex21
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx76
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/catalan-apa.lbx174
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx76
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx76
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/finnish-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx76
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx81
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx357
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx76
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx357
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx357
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx69
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx357
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx68
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx77
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx76
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx69
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx172
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx69
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx358
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/turkish-apa.lbx360
-rw-r--r--macros/latex/contrib/biblatex/CHANGES.md12
-rw-r--r--macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst4
-rw-r--r--macros/latex/contrib/biblatex/doc/biblatex.pdfbin1630751 -> 1639603 bytes
-rw-r--r--macros/latex/contrib/biblatex/doc/biblatex.tex129
-rw-r--r--macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdfbin187105 -> 196392 bytes
-rw-r--r--macros/latex/contrib/biblatex/latex/biblatex.def1
-rw-r--r--macros/latex/contrib/biblatex/latex/biblatex.sty343
-rw-r--r--macros/latex/contrib/biblatex/latex/blx-bibtex.def5
-rw-r--r--macros/latex/contrib/biblatex/latex/lbx/danish.lbx528
-rw-r--r--macros/latex/contrib/biblatex/latex/lbx/galician.lbx1
-rw-r--r--macros/latex/contrib/biblatex/latex/lbx/spanish.lbx2
-rw-r--r--macros/latex/contrib/biblatex/latex/lbx/turkish.lbx42
-rw-r--r--macros/latex/contrib/chess-problem-diagrams/README4
-rw-r--r--macros/latex/contrib/chess-problem-diagrams/diagram.dtx189
-rw-r--r--macros/latex/contrib/chess-problem-diagrams/diagram.ins1
-rw-r--r--macros/latex/contrib/chess-problem-diagrams/diagram.pdfbin357255 -> 360083 bytes
-rw-r--r--macros/latex/contrib/microtype/README.md2
-rw-r--r--macros/latex/contrib/microtype/microtype-code.pdfbin2173361 -> 2172322 bytes
-rw-r--r--macros/latex/contrib/microtype/microtype-utf.dtx5
-rw-r--r--macros/latex/contrib/microtype/microtype.dtx108
-rw-r--r--macros/latex/contrib/microtype/microtype.pdfbin670010 -> 670022 bytes
-rw-r--r--macros/latex/contrib/schwalbe-chess/README2
-rw-r--r--macros/latex/contrib/schwalbe-chess/schwalbe.dtx229
-rw-r--r--macros/latex/contrib/schwalbe-chess/schwalbe.ins1
-rw-r--r--macros/latex/contrib/schwalbe-chess/schwalbe.pdfbin230734 -> 242624 bytes
62 files changed, 3974 insertions, 2341 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/README b/macros/latex/contrib/biblatex-contrib/biblatex-apa/README
index 0d6e552303..7a5602951d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/README
@@ -1,7 +1,7 @@
Permission is granted to copy, distribute and/or modify this software under
the terms of the LaTeX Project Public License, version
1.3c (http://www.latex-project.org/lppl.txt). The current
-maintainer is Philip Kime (© 2019).
+maintainer is Philip Kime (© 2022).
This package is a biblatex style for APA (American Psychological
Association) style compliant documents typeset in LaTeX. It
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
index 4d9ee874c6..ad5493e264 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{american-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{american}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -264,7 +265,8 @@
washington = {{Washington}{{W\adddot A\adddot}}},
westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
- wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}},
+ publication = {{Publication}{Publication}}
}
%
@@ -276,68 +278,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
index 5523f83e17..ee19f6dd0a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2021/12/24\space v9.15\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2022/06/22\space v9.16\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{same} % APA examples all have URLs in same font as text
@@ -157,37 +157,41 @@
or test {\ifentrytype{legal}}
or ( test {\ifentrytype{legadminmaterial}} and
test {\ifkeyword{proposed}} ) }
- {\printtext{%
- \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
+ {\printtext[#1date]{%
+ \mkbibdateapalongmdy{#1year}{#1yeardivision}{#1month}{#1day}%
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
{\bibdatedash\bibstring{present}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalongmdy{}{}{#1endday}}}%
- {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
- {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
+ {\iffieldundef{#1endyeardivision}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalongmdy{}{}{}{#1endday}}}%
+ {\mkbibdateapalongmdy{}{}{#1endmonth}{#1endday}}}%
+ {\mkbibdateapalongmdy{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}}}
+ {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
\dateuncertainprint}}
{\printtext{%
- \mkbibdateapalong{#1year}{#1month}{#1day}%
+ \mkbibdateapalong{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
{\bibdatedash\bibstring{present}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalong{}{}{#1endday}}}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
+ {\iffieldundef{#1endyeardivision}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalong{}{}{}{#1endday}}}%
+ {\mkbibdateapalong{}{}{#1endmonth}{#1endday}}}%
+ {\mkbibdateapalong{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}%
+ \dateeraprint{#1endyear}}}
+ {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
\enddateuncertainprint}}}}%
\endgroup}
@@ -196,24 +200,26 @@
\begingroup
\blx@metadateinfo{#1}%
\iffieldundef{#1year}{}
- {\printtext{%
+ {\printtext[#1date]{%
\datecircaprint
- \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+ \mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
\dateuncertainprint
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
{\bibdatedash\bibstring{present}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalongextra{}{}{#1endday}}}
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
+ {\iffieldundef{#1endyeardivision}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalongextra{}{}{}{#1endday}}}
+ {\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}%
+ \dateeraprint{#1endyear}}}
+ {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
\enddateuncertainprint}}}%
\endgroup}
@@ -226,8 +232,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 8.12) sort citations
-% (APA 8.17) More than two authors is truncated to one but overriden for list ambiguity to
-% point of no ambiguity
+% (APA 8.17,8.18) More than two authors is truncated to one but overriden for list ambiguity to
+% point of no ambiguity but only when same year.
% (APA 8.20) Use initials to disambiguate shared surnames
% (APA 8.19) Use year postfix to disambiguate multiple items in same year
% (APA 9.44, 9.46, 9.47) Sorting is nyt but we need to account for PUBSTATE which comes
@@ -236,6 +242,25 @@
% (APA Figure 9.2) Sorting ignores punctuation in names
% (APA 9.47) Ignore "The", "An" and "A" when sorting titles
+% Used for sorting citations with biblatex option "sortcites" as this needs to use
+% the silly APA standards for name list visibility (8.17, 8.18) in cites which differs from the reference list.
+\DeclareSortingNamekeyTemplate[apasortcite]{
+ \visibility{cite}
+ \keypart{
+ \namepart[use=true]{prefix}
+ \namepart{family}
+ }
+ \keypart{
+ \namepart{given}
+ }
+ \keypart{
+ \namepart{suffix}
+ }
+ \keypart{
+ \namepart[use=false]{prefix}
+ }
+}
+
\DeclareNosort{
\nosort{setnames}{\regexp{\p{General_Category=Punctuation}}}
\nosort{settitles}{\regexp{\A(?:The|An|A)\s+}}
@@ -322,6 +347,7 @@
maxitems=999,%
origdate=apalong,%
pagetracker=true,%
+ pluralothers=true,%
sortcites=true,%
sorting=apa,%
uniquelist=minyear,%
@@ -332,7 +358,35 @@
usetranslator=true,%
usenarrator=true}
+
+% It's not completely obvious but it's implied that names identical apart from a suffix
+% are to be treated as different name lists for extradate calculation so we add suffix
+% to the default definition
+\DeclareUniquenameTemplate{
+ \namepart[use=true, base=true]{prefix}
+ \namepart[base=true]{family}
+ \namepart{given}
+ \namepart{suffix}
+}
+
+% Force, in every refsection, the generation of refcontext data with a
+% sorting name key template which works for citation sorting with sortcites. This
+% would not be generated in the .bcf otherwise and therefore no sorted list
+% with this sorting name key tenplate would generated in teh .bbl by biber because no
+% \printbibliography would be executed in this context since it is only
+% used for sorting of citations truncated to one name as per 8.17/8.18.
%
+% Two things needs to happen in general:
+% 1. Generate the refcontext sorted data list in the .bbl (biber) which requires a datalist
+% section in the .bcf. This latter is done by \printbibliography/\printbiblist or \GenRefcontextData
+% when no \printbibliography/\printbiblist is done in the refcontext
+% 2. Switch to the relevant refcontext at the right time in order to pull the date from the
+% correct data list (\newrefcontext/\begin{refcontext})
+\AtBeginRefsection{\GenRefcontextData{sortingnamekeytemplatename=apasortcite}}
+% Switch to the reference context using citation visibility setting for sorting of citations
+\AtEveryCite{\localrefcontext[sortingnamekeytemplatename=apasortcite]}
+
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
@@ -367,6 +421,7 @@
\map{
\pertype{inproceedings}
\step[notfield=editor, final]
+ \step[notfield=crossref, final]% A bit suspect but assuming that any crossref contains EDITOR
\step[fieldsource=booktitle, fieldtarget=journaltitle]
\step[typesource=inproceedings, typetarget=article]
}
@@ -427,7 +482,7 @@
\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
% NOTE
-\DeclareFieldFormat[legmaterial,legadminmaterial]{note}{\mkbibparens{#1}}
+\DeclareFieldFormat[legmaterial,legadminmaterial,report]{note}{\mkbibparens{#1}}
% BOOKTITLEADDON
\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
@@ -451,7 +506,6 @@
\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
% CHAPTER
-
\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
% NUMBER
@@ -467,7 +521,8 @@
\ifthenelse{%
\iffieldequalstr{type}{report}\OR%
\iffieldequalstr{type}{execorder}}{\bibcpstring{number}~\apanum{#1}}{\apanum{#1}}}
-
+\DeclareFieldFormat[thesis]{number}{%
+ \bibcpstring{publication}\setunit{\addspace}\bibcpstring{number}~\apanum{#1}}
% PAGES
\DeclareFieldFormat{pageswithprefix}{\mkpageprefix[bookpagination]{#1}}
@@ -496,10 +551,6 @@
\DeclareFieldFormat[dataset,software]{version}{\bibcpstring{version}~#1}
\DeclareFieldFormat[online]{version}{\mkbibparens{#1}}
-% URL
-\DeclareFieldFormat{url}{\url{#1}}
-\DeclareFieldFormat{urldate}{#1}
-
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -522,16 +573,6 @@
% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
% all of the names in the list to work on
-% It's not completely obvious but it's implied that names identical apart from a suffix
-% are to be treated as different name lists for extradate calculation so we add suffix
-% to the default definition
-\DeclareUniquenameTemplate{
- \namepart[use=true, base=true]{prefix}
- \namepart[base=true]{family}
- \namepart{given}
- \namepart{suffix}
-}
-
\DeclareNameAlias{default}{apaauthor}
\DeclareNameFormat{apaauthor}{%
@@ -575,7 +616,7 @@
{}}
\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\newunitpunct}
-\DeclareDelimAlias*[bib,biblist]{nonameyeardelim}{nameyeardelim}
+\DeclareDelimAlias[bib,biblist]{nonameyeardelim}{nameyeardelim}
\renewbibmacro*{author/editor}{%
\ifnameundef{author}
@@ -730,7 +771,8 @@
\setunit{\subtitlepunct}%
\printfield[apacase]{subtitle}}}%
\setunit{\addspace}%
- \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \ifthenelse{\ifentrytype{inbook}\OR\ifentrytype{thesis}}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \ifentrytype{thesis}{\usebibmacro{addinfo3}}{}%
\setunit{\addspace}%
\printfield{titleaddon}%
\setunit{\addspace}%
@@ -743,7 +785,6 @@
\printfield{edition}%
\setunit*{\addcomma\addspace}%
\ifthenelse{\ifentrytype{report}\OR%
- \ifentrytype{thesis}\OR%
\ifentrytype{unpublished}\OR%
\ifentrytype{dataset}\OR%
\ifentrytype{software}\OR%
@@ -753,9 +794,9 @@
\setunit*{\addcomma\addspace}%
\ifentrytype{inbook}{\printfield{pages}}{}%
\setunit*{\addcomma\addspace}%
- \ifentrytype{book}{\printfield{volumes}}{}%
+ \ifthenelse{\ifentrytype{book}\OR\ifentrytype{inbook}}{\printfield{volumes}}{}%
\setunit*{\addcomma\addspace}%
- \ifentrytype{book}{\printfield{volume}}{}}}
+ \ifthenelse{\ifentrytype{book}\OR\ifentrytype{inbook}}{\printfield{volume}}{}}}
% Additional post title information in brackets unless it's the meta subtype "nonacademic"
% which is used to conditionalise date formats in the .lbx files
@@ -767,22 +808,33 @@
{\bibcplstring{\thefield{entrysubtype}}}
{\printfield{entrysubtype}}}%
\setunit*{\addsemicolon\addspace}%
- \printfield{note}}}
+ \ifentrytype{report}{}{\printfield{note}}}}
% number/issue information
\newbibmacro*{addinfo3}{%
- \iffieldundef{type}
- {\iffieldundef{issue}
- {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}
- {\printfield{issue}\setunit{\addspace}%
- \iffieldundef{number}
+ \ifentrytype{thesis}
+ {\iffieldundef{number}
+ {}
+ {\printtext[parens]{\printfield{number}}}%
+ \setunit{\addspace}%
+ \iffieldundef{type}
+ {}
+ {% Inconsistent - standard thesis types have institution inside the brackts, manual types outside ...
+ \ifthenelse{\iffieldequalstr{type}{phdthesis}\OR\iffieldequalstr{type}{mathesis}}
+ {\printtext[brackets]{\printfield{type}\setunit*{\addcomma\addspace}\printlist{institution}}}
+ {\printtext[brackets]{\printfield{type}}\setunit*{\adddot\addspace}\printlist{institution}}}}
+ {\iffieldundef{type}
+ {\iffieldundef{issue}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}
+ {\printfield{issue}\setunit{\addspace}%
+ \iffieldundef{number}
{}
{\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}}}
- {\printfield{type}\setunit{\addspace}%
- \iffieldundef{number}
- {}
- {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}}%
- \ifthenelse{\ifentrytype{dataset}\OR\ifentrytype{software}}
+ {\printfield{type}\setunit{\addspace}%
+ \iffieldundef{number}
+ {}
+ {\bibcpstring{number}~\printfield{number}}}}% Inconsistent - numbers after type aren't necessarily numbers ...
+ \ifthenelse{\ifentrytype{dataset}\OR\ifentrytype{software}}
{\setunit*{\addsemicolon\addspace}%
\printfield{version}}
{}}
@@ -1284,7 +1336,9 @@
{\usebibmacro{in}%
\printnames[apanames][-\value{listtotal}]{execproducer}%
\setunit{\addspace}%
- \bibcplstring[\mkbibparens]{execproducers}%
+ \ifthenelse{\the\c@execproducer=1}%
+ {\bibcplstring[\mkbibparens]{execproducer}}
+ {\bibcplstring[\mkbibparens]{execproducers}}%
\setunit{\addcomma\addspace}%
\printfield{maintitle}}}
@@ -1383,24 +1437,22 @@
\settoggle{bbx:annotation}{#1}}
\ExecuteBibliographyOptions{annotation=true}
+\long\def\blxapa@appunit#1{%
+ \iftoggle{blx@keepunit}
+ {}
+ {\gappto\blx@unitpunct{#1}%
+ \global\toggletrue{blx@unit}}}
+
\renewbibmacro*{annotation}{%
- \ifboolexpr{test {\iffieldundef{annotation}}
- or not togl {bbx:annotation}}
- {\IfFileExists{\bibannotationprefix\thefield{entrykey}.tex}
- {\begingroup
- \togglefalse{blx@bibliography}%
- \newline
- \setunit{}%
- \printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}%
- \endgroup}
- {}}
+ \iftoggle{bbx:annotation}
{\begingroup
\togglefalse{blx@bibliography}%
- \newline
- \setunit{}%
- \printfield{annotation}%
- \endgroup}}
-
+ \blxapa@appunit{\newline}%
+ \iffieldundef{annotation}
+ {\printfile[annotation]{\bibannotationprefix\thefield{entrykey}.tex}}
+ {\printfield{annotation}}%
+ \endgroup}
+ {}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1904,6 +1956,8 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
+ \printfield{note}%
+ \setunit{\addspace}\newblock
\usebibmacro{apa:related}%
\newunit\newblock
\printlist{institution}%
@@ -1951,8 +2005,6 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printlist{institution}%
- \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{doi+url}%
@@ -2066,9 +2118,22 @@
-%(APA 9.35) No periods after URLS
+%(APA 9.35) No periods after URLS and DOIs
% we'll override a global url option for for @online entries
\ExecuteBibliographyOptions[online]{url=true}
+
+\DeclareFieldFormat{doi}{%
+ \ifhyperref
+ {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
+ {\nolinkurl{https://doi.org/#1}}%
+ \nopunct}
+
+\DeclareFieldFormat{url}{\url{#1}\nopunct}
+
+\DeclareFieldFormat{urldate}{%
+ \bibstring{retrieved}\space#1%
+ \urldatecomma\bibstring{from}}
+
\newbibmacro*{doi+url}{%
\ifboolexpr{ test {\iffieldundef{doi}}
or not togl {bbx:doi}}
@@ -2078,7 +2143,6 @@
{\usebibmacro{url+urldate}%
\setunit{\addspace}}}
{\printfield{doi}%
- \renewcommand*{\finentrypunct}{\relax}%
\setunit{\addspace}}}
\renewbibmacro*{url+urldate}{%
@@ -2086,18 +2150,9 @@
{}
{\iffieldundef{urlyear}
{}
- {\bibstring{retrieved}%
- \setunit{\addspace}%
- \printurldate
- \setunit{\urldatecomma}%
- \bibstring{from}%
+ {\printurldate
\setunit{\addspace}}%
- \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
-
-\DeclareFieldFormat{doi}{%
- \ifhyperref
- {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
- {\nolinkurl{https://doi.org/#1}}}
+ \printfield{url}}}
\newbibmacro*{location+publisher}{%
\printlist{location}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
index 22e489feaa..591fa50aea 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2021/12/24\space v9.15\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2022/06/22\space v9.16\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -45,7 +45,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 8.10) Suffices are not shown in citations
-% (APA 8.17) 3+ authors have "et al."
% (APA 8.20) Initials only for primary author and only when not unique across all *primary* authors
\newbibmacro*{labelname:doname}[8]{%
@@ -118,12 +117,12 @@
\def\citeresetapa{\global\let\cbx@apa@names\@empty}
\citeresetapa
\def\cbx@apa@ifnamesaved{%
- \xifinlist{\thefield{fullhash}}{\cbx@apa@names}
+ \xifinlist{\thefield{namehash}}{\cbx@apa@names}
{\@firstoftwo}
{\@secondoftwo}}
\newbibmacro*{cite:author}{%
- \iffieldequals{fullhash}{\cbx@lasthash}
+ \iffieldequals{namehash}{\cbx@lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
@@ -131,7 +130,7 @@
{\ifnameundef{labelname}
% No author/editor
{\usebibmacro{cite:noname}%
- \savefield{fullhash}{\cbx@lasthash}}
+ \savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
{\printnames{labelname}}%
@@ -139,20 +138,11 @@
{\printnames{shortauthor}}
{\printnames[labelname]{author}%
\addspace\printnames[sabrackets]{shortauthor}}}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
-% Using fullhash instead of namehash otherwise we may omit namelist for
-% lists which are equal only because of minnames truncation i.e:
-%
-% X and Y and Z (2009)
-% X and W and V (2010)
-%
-% which have the same namehash due to minnames visibility truncation to 1
-% would be printed incorrectly as
-% \cite{one, two} -> X, Y & Z 2009, 2010
\newbibmacro*{cite}{%
- \iffieldequals{fullhash}{\cbx@lasthash}
+ \iffieldequals{namehash}{\cbx@lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
@@ -162,7 +152,7 @@
{\usebibmacro{cite:noname}%
\setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx@lasthash}}
+ \savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
{\printnames{labelname}}%
@@ -172,14 +162,14 @@
\addspace\printnames[sabrackets]{shortauthor}}}%
\setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
\renewcommand*{\iffinalcitedelim}{%
\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
\newbibmacro*{textcite}{%
- \iffieldequals{fullhash}{\cbx@lasthash}
+ \iffieldequals{namehash}{\cbx@lasthash}
% Compact cite - more than one thing for same author
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}
@@ -226,7 +216,7 @@
% Actual year printing
\usebibmacro{cite:plabelyear+extradate}%
% Save name hash for checks later
- \savefield{fullhash}{\cbx@lasthash}}%
+ \savefield{namehash}{\cbx@lasthash}}%
\stepcounter{textcitecount}}}
\newbibmacro*{cite:plabelyear+extradate}{%
@@ -236,6 +226,8 @@
\clearfield{labelday}% don't want days in citations
\clearfield{labelendmonth}% don't want months in citations
\clearfield{labelendday}% don't want days in citations
+ \clearfield{labelyeardivision}% don't want yeardivisions in citations
+ \clearfield{labelendyeardivision}% don't want yeardivisions in citations
\iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges
{\clearfield{labelendyear}}
{}%
@@ -364,11 +356,11 @@
\newbibmacro*{citeyear}{%
\iffieldundef{labelyear}
{\usebibmacro{cite:init}}
- {\iffieldequals{fullhash}{\cbx@lasthash}
+ {\iffieldequals{namehash}{\cbx@lasthash}
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}
{\usebibmacro{cite:plabelyear+extradate}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
%
@@ -424,9 +416,9 @@
\global\undef\cbx@lasthash}
\newbibmacro*{cite:post}{%
- \xifinlist{\thefield{fullhash}}{\cbx@apa@names}
+ \xifinlist{\thefield{namehash}}{\cbx@apa@names}
{}
- {\listxadd{\cbx@apa@names}{\thefield{fullhash}}}}
+ {\listxadd{\cbx@apa@names}{\thefield{namehash}}}}
\newbibmacro*{cite:labelyear}{%
\printfield{labelyear}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
index f15b08239e..dc81deefca 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2021/12/24\space v9.15\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2022/06/22\space v9.16\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
index 84a2cccda3..b511a99e17 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{austrian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,56 +67,130 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {austrian},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
% commenton = {{Comment\space on}{Comment\space on}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
@@ -125,9 +200,9 @@
with = {{mit}{mit}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -135,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
% annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -151,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib
index 464e4da4a9..59045ece96 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib
@@ -60,24 +60,24 @@
}
@BOOK{8.12d,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title1}
}
@BOOK{8.12e,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title1},
DATE = {2017}
}
@BOOK{8.12f,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title2},
DATE = {2017}
}
@BOOK{8.12g,
- GROUPAUTHOR = {{Department of Veteran Affairs}},
+ author = {{Department of Veteran Affairs}},
TITLE = {Title1},
DATE = {2019}
}
@@ -169,7 +169,7 @@
% (APA 8.13)
@BOOK{8.13a,
- GROUPAUTHOR = {{Centers for Disease Control and Prevention}},
+ author = {{Centers for Disease Control and Prevention}},
TITLE = {Title},
DATE = {2019}
}
@@ -205,7 +205,7 @@
}
@BOOK{8.13g,
- GROUPAUTHOR = {{Beck Institute for Cognitive Behaviour Therapy}},
+ author = {{Beck Institute for Cognitive Behaviour Therapy}},
TITLE = {Title},
DATE = {2012}
}
@@ -284,14 +284,14 @@
}
@BOOK{8.17d,
- GROUPAUTHOR = {{National Institute of Mental Health}},
+ author = {{National Institute of Mental Health}},
SHORTAUTHOR = {NIMH},
TITLE = {Title},
DATE = {2020}
}
@BOOK{8.17e,
- GROUPAUTHOR = {{Stanford University}},
+ author = {{Stanford University}},
TITLE = {Title},
DATE = {2020}
}
@@ -309,7 +309,7 @@
}
@BOOK{8.17h,
- GROUPAUTHOR = {{American Educational Research Association} and {Some other group} and {Yet another group}},
+ author = {{American Educational Research Association} and {Some other group} and {Yet another group}},
TITLE = {Title},
DATE = {2014}
}
@@ -351,6 +351,18 @@
DATE = {1991}
}
+@BOOK{8.18g,
+ AUTHOR = {Author Red and Author Green and Author Black and Author Blue},
+ TITLE = {Title One},
+ DATE = {2022}
+}
+
+@BOOK{8.18h,
+ AUTHOR = {Author Red and Author Green and Author White and Author Blue},
+ TITLE = {Title Two},
+ DATE = {2022}
+}
+
% (APA 8.19)
@BOOK{8.19a,
AUTHOR = {A. Judge and B. Kammeyer-Mueller},
@@ -432,14 +444,14 @@
% (APA 8.21)
@BOOK{8.21a,
- GROUPAUTHOR = {{The American Psychological Association}},
+ author = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title1},
DATE = {2017}
}
@BOOK{8.21b,
- GROUPAUTHOR = {{The American Psychological Association}},
+ author = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title2},
DATE = {2006}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib
index b91b1faae5..96a7863f54 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib
@@ -68,6 +68,25 @@
DATE = {2014}
}
+% Testing seasons
+@ARTICLE{9.14:1,
+ AUTHOR = {Arthur Test},
+ TITLE = {Test Title},
+ JOURNALTITLE = {Seasonal Journal},
+ VOLUME = {33},
+ NUMBER = {2},
+ DATE = {2012-22}
+}
+
+@ARTICLE{9.14:2,
+ AUTHOR = {Arthur Test},
+ TITLE = {Test Title 2},
+ JOURNALTITLE = {Seasonal Journal},
+ VOLUME = {34},
+ NUMBER = {3},
+ DATE = {2012-22/2012-23}
+}
+
% (APA 9.44)
@NAMEONLY{9.44:1a,
AUTHOR = {A. S. Benjamin}
@@ -1365,7 +1384,7 @@
% (APA 10.4 Example 53)
@REPORT{10.4:53,
- AUTHOR = {{British Cardiovascular Society Working Group}},
+ AUTHOR = {{British Cardiovascular Society Working Group}},
TITLE = {British {Cardiovascular} {Society} {Working} {Group} report},
SUBTITLE = {Out-of-hours Cardiovascular Care: {Management} of
Cardiac Emergencies and Hospital In-patients},
@@ -1376,7 +1395,7 @@
% (APA 10.4 Example 54)
@REPORT{10.4:54,
- AUTHOR = {{U.S. Securities and Exchange Commission}},
+ AUTHOR = {{U.S. Securities and Exchange Commission}},
TITLE = {Agency Financial Report},
SUBTITLE = {Fiscal Year 2017},
URL = {https://www.sec.gov/files/sec-2017-agency-financial-report.pdf},
@@ -1385,14 +1404,14 @@
% (APA 10.4 Example 55)
@REPORT{10.4:55a,
- AUTHOR = {{American Counseling Association}},
+ AUTHOR = {{American Counseling Association}},
TITLE = {2014 {ACA} code of ethics},
URL = {https://www.counseling.org/knowledge-center},
DATE = {2014}
}
@REPORT{10.4:55b,
- AUTHOR = {{American Nurses Association}},
+ AUTHOR = {{American Nurses Association}},
TITLE = {Code of Ethics for Nurses with Interpretive Statements},
URL = {https://www.nursingworld.org/coe-view-only},
DATE = {2015}
@@ -1400,10 +1419,10 @@
@REPORT{10.4:55c,
AUTHOR = {{American Psychological Association}},
- TITLE = {Ethical Principles of Psychologists and Code of Conduct},
- TYPE = {2002, amended effective June 1, 2010, and January 1, 2017},
- URL = {https://www.apa.org/ethics/code/index.aspx},
- DATE = {2017}
+ TITLE = {Ethical Principles of Psychologists and Code of Conduct},
+ NOTE = {2002, amended effective June 1, 2010, and January 1, 2017},
+ URL = {https://www.apa.org/ethics/code/index.aspx},
+ DATE = {2017}
}
% (APA 10.4 Example 56)
@@ -1417,7 +1436,8 @@
AUTHOR+an:role = {1="Principal Investigator"},
TITLE = {Stress, Self-Regulation and Psychopathology in Middle Childhood},
TITLEADDON = {Grant},
- TYPE = {Project No. 5R01HD081252-04},
+ TYPE = {Project},
+ NUMBER = {5R01HD081252-04},
INSTITUTION = {Eunice Kennedy Shriver National Institute of Child
Health \& Human Development},
URL = {https://projectreporter.nih.gov/project_info_details.cfm?aid=9473071&icde=40092311},
@@ -1525,7 +1545,7 @@
BOOKTITLE = {Proceedings of the National Academy of Sciences, USA},
VOLUME = {116},
NUMBER = {47},
- PAGES = {23499–-23504},
+ PAGES = {23499--23504},
DATE = {2019},
DOI = {10.1073/pnas.1910510116}
}
@@ -1558,35 +1578,35 @@
}
% (APA 10.6 Example 64)
-@THESIS{10.6:64,
+% Note the override of the auto-populated "phdthesis" type as this is a
+% non-standard, non-localised string type
+@PHDTHESIS{10.6:64,
AUTHOR = {L. Harris},
TITLE = {Instructional Leadership Perceptions and Practices of
Elementary School Leaders},
- TITLEADDON = {Unpublished Doctoral Dissertation},
+ TYPE = {Unpublished doctoral dissertation},
INSTITUTION = {University of Virginia},
DATE = {2014}
}
% (APA 10.6 Example 65)
-@THESIS{10.6:65,
+@PHDTHESIS{10.6:65,
AUTHOR = {M. M. Hollander},
TITLE = {Resistance to Authority},
- SUBTITLE = {Methodological Innovations and New Lessons from the
- {Milgram} Experiment},
- TITLEADDON = {Doctoral Dissertation, {University} of {Wisconsin}--{Madison}},
- PUBLISHER = {{ProQuest Dissertations and Theses Global}},
- TYPE = {Publication},
+ SUBTITLE = {Methodological Innovations and New Lessons from the {Milgram} Experiment},
+ INSTITUTION = {University of Wisconsin--Madison},
+ PUBLISHER = {ProQuest Dissertations {and} Theses Global},
NUMBER = {10289373},
DATE = {2017}
}
% (APA 10.6 Example 66)
-@THESIS{10.6:66,
+@MASTERSTHESIS{10.6:66,
AUTHOR = {V. H. Hutcheson},
TITLE = {Dealing with Dual Differences},
SUBTITLE = {Social Coping Strategies of Gifted and Lesbian, Gay,
Bisexual, Transgender, and Queer Adolescents},
- TITLEADDON = {Master's Thesis, {The} {College} of {William} \& {Mary}},
+ INSTITUTION = {The College of William \& Mary},
PUBLISHER = {William \& Mary Digital Archive},
URL = {https://digitalarchive.wm.edu/bitstream/handle/10288/16594/HutchesonVirginia2012.pdf},
DATE = {2012}
@@ -1923,6 +1943,13 @@
% (APA 10.12 Example 86)
% ENTRYSUBTYPE is a localisation string
+% Note that if there were only one author, the annotation would be
+% "1=execproducer" to get the singular form and apply it only to the first
+% item in the name list, even though there is only one. List item
+% annotations (those of the form "n=<annotation>" should be the singular form
+% whereas whole field annotations (those of the form "=<annotation>" should usually
+% be the plural form. So, when using the singular form, a list item index
+% is mandatory.
@VIDEO{10.12:86,
ENTRYSUBTYPE = {tvseries},
AUTHOR = {D. Simon and R. F. Colesberry and Kostroff Noble, N.},
@@ -2264,28 +2291,28 @@
% (APA 10.15 Example 103)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:103a,
- ENTRYSUBTYPE = {Tweet},
+ ENTRYSUBTYPE = {Tweet},
AUTHOR = {{APA Education}},
AUTHOR+an:username = {1="@APAEducation"},
- TITLE = {College Students are Forming Mental-Health
+ TITLE = {College Students are Forming Mental-Health
Clubs--and They're Making a Difference @washingtonpost},
- TITLEADDON = {Thumbnail with link attached},
- EPRINT = {Twitter},
- DATE = {2018-06-29},
- URL = {https://twitter.com/apaeducation/status/1012810490530140161}
+ TITLEADDON = {Thumbnail with link attached},
+ EPRINT = {Twitter},
+ DATE = {2018-06-29},
+ URL = {https://twitter.com/apaeducation/status/1012810490530140161}
}
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:103b,
- ENTRYSUBTYPE = {Tweet},
+ ENTRYSUBTYPE = {Tweet},
AUTHOR = {{Badlands National Park}},
AUTHOR+an:username = {1="@BadlandsNPS"},
- TITLE = {Biologists Have Identified More Than 400
+ TITLE = {Biologists Have Identified More Than 400
Different Plant Species Growing in
{@BadlandsNPS} \#{DYK} \#biodoversity},
- EPRINT = {Twitter},
- DATE = {2018-02-26},
- URL = {https://twitter.com/BadlandsNPS/status/968196500412133379}
+ EPRINT = {Twitter},
+ DATE = {2018-02-26},
+ URL = {https://twitter.com/BadlandsNPS/status/968196500412133379}
}
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@@ -2303,104 +2330,104 @@
% (APA 10.15 Example 104)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:104,
- ENTRYSUBTYPE = {Twitter profile},
+ ENTRYSUBTYPE = {Twitter profile},
AUTHOR = {{APA Style}},
AUTHOR+an:username = {1="@APA\_Style"},
- TITLE = {Tweets},
- EPRINT = {Twitter},
- URL = {https://twitter.com/APA_Style},
- URLDATE = {2019-11-01}
+ TITLE = {Tweets},
+ EPRINT = {Twitter},
+ URL = {https://twitter.com/APA_Style},
+ URLDATE = {2019-11-01}
}
% (APA 10.15 Example 105)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:105a,
- ENTRYSUBTYPE = {Status update},
- AUTHOR = {N. Gaiman},
- TITLE = {100,000+ {Rohingya} Refugees Could be at
+ ENTRYSUBTYPE = {Status update},
+ AUTHOR = {N. Gaiman},
+ TITLE = {100,000+ {Rohingya} Refugees Could be at
Serious Risk during {Bangladesh's} Monsoon
Season. {My} Fellow {UNHCR} {Goodwill}
{Ambassador} {Cate} {Blanchett} is},
- TITLEADDON = {Image attached},
- EPRINT = {Facebook},
- URL = {http://bit.ly/2JQxPAD},
- DATE = {2018-03-22}
+ TITLEADDON = {Image attached},
+ EPRINT = {Facebook},
+ URL = {http://bit.ly/2JQxPAD},
+ DATE = {2018-03-22}
}
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:105b,
- ENTRYSUBTYPE = {Infographic},
- AUTHOR = {{National Institute of Mental Health}},
- TITLE = {Suicide Affects all Ages, Genders, Races, and
+ ENTRYSUBTYPE = {Infographic},
+ AUTHOR = {{National Institute of Mental Health}},
+ TITLE = {Suicide Affects all Ages, Genders, Races, and
Ethnicities. {Check} out These 5 {Action}
{Steps} for {Helping} {Someone} in {Emotional}
{Pain}},
- EPRINT = {Facebook},
- URL = {http://bit.ly/321Qstq},
- DATE = {2018-11-28}
+ EPRINT = {Facebook},
+ URL = {http://bit.ly/321Qstq},
+ DATE = {2018-11-28}
}
% Note protecting of automatic sentence-casing in SUBTITLE for url
@ONLINE{10.15:105c,
- ENTRYSUBTYPE = {video},
- AUTHOR = {{News From Science}},
- TITLE = {These Frogs Walk Instead of Hop},
- SUBTITLE = {{h}ttps://scimag.2{K}lriw{H}},
- EPRINT = {Facebook},
- URL = {https://www.facebook.com/ScienceNOW/videos/10155508587605108},
- DATE = {2018-06-26}
+ ENTRYSUBTYPE = {video},
+ AUTHOR = {{News From Science}},
+ TITLE = {These Frogs Walk Instead of Hop},
+ SUBTITLE = {{h}ttps://scimag.2{K}lriw{H}},
+ EPRINT = {Facebook},
+ URL = {https://www.facebook.com/ScienceNOW/videos/10155508587605108},
+ DATE = {2018-06-26}
}
% (APA 10.15 Example 106)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:106,
- ENTRYSUBTYPE = {Facebook page},
- AUTHOR = {{Smithsonian's National Zoo and Conservation
+ ENTRYSUBTYPE = {Facebook page},
+ AUTHOR = {{Smithsonian's National Zoo and Conservation
Biology Institute}},
- TITLE = {Home},
- EPRINT = {Facebook},
- URL = {https://www.facebookcom/nationalzoo},
- URLDATE = {2019-06-22}
+ TITLE = {Home},
+ EPRINT = {Facebook},
+ URL = {https://www.facebookcom/nationalzoo},
+ URLDATE = {2019-06-22}
}
% (APA 10.15 Example 107)
% ENTRYSUBTYPE is a localisation string
@ONLINE{10.15:107,
- ENTRYSUBTYPE = {photographs},
+ ENTRYSUBTYPE = {photographs},
AUTHOR = {{Zeitz MOCAA}},
AUTHOR+an:username = {1="@zeitzmocaa"},
- TITLE = {Grade 6 Learners from {Parkfields} {Primary}
- {School} in {Hanover} {Park} Visited the
- Museum for a Tour and Workshop Hosted by},
- EPRINT = {Instagram},
- URL = {https://www.instagram.com/p/BqpHpjFBs3b},
- DATE = {2018-11-26}
+ TITLE = {Grade 6 Learners from {Parkfields} {Primary}
+ {School} in {Hanover} {Park} Visited the
+ Museum for a Tour and Workshop Hosted by},
+ EPRINT = {Instagram},
+ URL = {https://www.instagram.com/p/BqpHpjFBs3b},
+ DATE = {2018-11-26}
}
% (APA 10.15 Example 108)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:108,
- ENTRYSUBTYPE = {Highlight},
+ ENTRYSUBTYPE = {Highlight},
AUTHOR = {{The New York Public Library}},
AUTHOR+an:username = {1="@nypl"},
- TITLE = {The Raven},
- EPRINT = {Instagram},
- URL = {https://bitly.com/2FV8bu3},
- URLDATE = {2019-04-16}
+ TITLE = {The Raven},
+ EPRINT = {Instagram},
+ URL = {https://bitly.com/2FV8bu3},
+ URLDATE = {2019-04-16}
}
% (APA 10.15 Example 109)
% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
@ONLINE{10.15:109,
- ENTRYSUBTYPE = {Online forum post},
+ ENTRYSUBTYPE = {Online forum post},
AUTHOR = {{National Aeronautics Space Administration}},
AUTHOR+an:username = {1="nasa"},
- TITLE = {I'm {NASA} Astronaut {Scott} {Tingle}. {Ask}
- me anything about adjusting to being back on
- {Earth} after my first spaceflight!},
- EPRINT = {Reddit},
- URL = {https://www.reddit.com/r/IAmA/comments/9fagqy/im_nasa_astronaut_scott_tingle_ask_me_anything/},
- DATE = {2018-09-12}
+ TITLE = {I'm {NASA} Astronaut {Scott} {Tingle}. {Ask}
+ me anything about adjusting to being back on
+ {Earth} after my first spaceflight!},
+ EPRINT = {Reddit},
+ URL = {https://www.reddit.com/r/IAmA/comments/9fagqy/im_nasa_astronaut_scott_tingle_ask_me_anything/},
+ DATE = {2018-09-12}
}
% (APA 10.16 Example 110)
@@ -2506,11 +2533,11 @@
}
% (APA 11.4 Example 5)
-% For courts and year attached to specific elements of the citation list,
+% For courts and years attached to specific elements of the citation list,
% don't use ORGANIZATION/DATE, use literal citeorg/citedate annotations
% use the citeinfo annotation with the special annotation value "appeal" for
% any affirmed/repealed status in the citatation list
-% DATA/ORIGDATE are also included to make citations work
+% DATE/ORIGDATE are also included to make citations work
@JURISDICTION{11.4:5,
TITLE = {Durflinger v. Artiles},
CITATION = {563 F.Supp. 332 and aff'd and 727 F.2d 888},
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
index a1d1a5dfb7..11282803ef 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
index ae73685c10..88c1d101ab 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
@@ -199,19 +199,23 @@ However, in parenthetical cites, authors are separated by «\&»:\\
\apaex{\textcite{8.17g}}\\
\apaex{\parencite{8.17h}}
+\noindent\apa{8.18}\\
\noindent Automatic list disambiguation for ambiguous truncations. Note
that «et al» is plural so it will only truncate two or more names. If it
would truncate just one name, we just give the name:\\
\apaex{\textcite{8.18a}}\\
\apaex{\textcite{8.18b}}\\
\apaex{\textcite{8.18c}}\\
-\apaex{\textcite{8.18d}}
+\apaex{\textcite{8.18d}}\\
+\apaex{\textcite{8.18g}}\\
+\apaex{\textcite{8.18h}}
\noindent Automatic list disambiguation is only for ambiguous author lists
in the same year. This is implied in \apa{8.18} by the phrase «the same
in-text citation form». So these are not disambiguated:\\
\apaex{\textcite{8.18e}}\\
-\apaex{\textcite{8.18f}}
+\apaex{\textcite{8.18f}}\\
+\apaex{\parencite{8.18e,8.18f}}
\noindent\apa{8.19}\\
Citations of works by same authors in the same year:\\
@@ -326,6 +330,16 @@ list member.
\end{refsection}
\newpage
+% (APA 9.14)
+\begin{refsection}
+
+\nocite{9.14:1,9.14:2}
+
+\printbibliography[title={APA 9.14--Misc Date Elements}]
+
+\end{refsection}
+\newpage
+
% (APA 9.44)
\begin{refsection}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
index 435a58cdd3..315ee33446 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex
index 6c140a83ea..039d2bc551 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={9.15},
+ revision={9.16},
date={\today}}
\hypersetup{%
@@ -44,6 +44,9 @@ Please see the revision history below (section \ref{rev}) for details on change
version. This section is just for important things like incompatible
changes which users should be aware of.
+\minisec{9.16}
+|biber| 2.18+ and and |biblatex| 3.18 + are \emph{required}.
+
\minisec{9.0}
Completely overhauled for APA 7th edition. APA 7th edition is a lot more
consistent in terms of its formatting blocks and elements, resulting in
@@ -139,7 +142,8 @@ localisation. Thanks to Tea Tušar and Bogdan Filipič for the Slovenian
localisation. Thanks to Sebastian Ørsted for the Danish localisation.
Thanks to Jürgen Spitzmüller for the DGPs localisation hints. Thanks to
Sergei Golovan for the Russian localisation. Thanks to Vítor Míguez for the
-Galacian localisation.
+Galacian localisation. Thanks to Abdulkerim Gok for the Turkish
+translation.
\section{Use}\label{ref:use}
\label{use}
@@ -148,10 +152,11 @@ through the provided \TeX Live update utilities which will install it
automatically for you. If you need to install manually (to use a new
version which has not yet been published to the \TeX Live updaters, for
example), you can download it from CTAN and then, put the \path{.cbx},
-\path{.bbx} and \path{.lbx} files in your texmf tree, usually:\\
+\path{.bbx},\path{.dbx} and \path{.lbx} files in your texmf tree, usually:\\
\noindent\path{<texmf>/tex/latex/biblatex/cbx/apa.cbx}\\
\path{<texmf>/tex/latex/biblatex/bbx/apa.bbx}\\
+\path{<texmf>/tex/latex/biblatex/dbx/apa.dbx}\\
\path{<texmf>/tex/latex/biblatex/lbx/<language>-apa.lbx}\\
\noindent Specify the style in the usual way when loading Bib\LaTeX. If you
@@ -388,6 +393,16 @@ the examples.
\begin{changelog}
+\begin{release}{9.16}{2022-06-22}
+\item Minor documentation and bug fixes
+\item Added Turkish localisation
+\item Many German localisation enhancements
+\item Adding support for season year divisions (APA 9.14)
+\item Corrected support for plural ``et al'' requirement using new biblatex
+ feature
+\item Implemented citation name sorting requirement using new biblatex feature
+\end{release}
+
\begin{release}{9.15}{2021-12-24}
\item Remove (need for) |GROUPAUTHOR| field
\item Added Catalan support
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx
index aca23ff943..2cdaf9e341 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{brazilian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -134,7 +135,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -146,71 +148,89 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx
index d5b9bff627..95546c2df0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{british-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{british}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
- beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+ publication = {{Publication}{Publication}}
}
%
@@ -150,68 +152,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/catalan-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/catalan-apa.lbx
index c4749c28db..877dc0e981 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/catalan-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/catalan-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{catalan-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{catalan-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
% Translation based on:
% spanish-apa.lbx file (for source to translate from)
@@ -10,6 +10,7 @@
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -160,7 +161,8 @@
annodomini = {{despr\'es\space de\space Crist}{dC}},
beforechrist = {{abans\space de\space Crist}{aC}},
commonera = {{era\space comuna}{e\adddot c\adddot}},
- beforecommonera = {{abans\space de\space l'era\space comuna}{a\adddot e\adddot c\adddot}}
+ beforecommonera = {{abans\space de\space l'era\space comuna}{a\adddot e\adddot c\adddot}}
+ % publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -169,140 +171,90 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#3}%
- {}%
- {el\addspace\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {\addspace{en}\addspace}%
- {\iffieldundef{#3}%
- {en\addspace}%
- {\addspace{de}\addspace}%
- \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#2}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\addspace}%
- \thefield{#1}}}%
- \def\apa@lbx@es@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@es@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@es@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@es@mkdaterangeapalongextra{#1}}%
-}
-
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {el\addspace\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {\addspace{en}\addspace}%
+ {\iffieldundef{#4}%
+ {en\addspace}%
+ {\addspace{de}\addspace}%
+ \mkbibmonth{\thefield{#3}}{\addspace{de}\addspace}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
index 456b176a14..46abe45d0c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{danish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -150,7 +151,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -162,73 +164,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\thefield{#1}}%
- \iffieldundef{#3}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
- {}
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}%
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\thefield{#1}\printfield{extradate}}%
- \iffieldundef{#3}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
- {}
+ {}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONNTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\thefield{#1}}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx
index 61df911361..36e54273ed 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{dutch-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -150,71 +152,89 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx
index d6bf533c5f..e407b5bcb6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{english-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{english}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -140,7 +141,8 @@
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
- beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+ publication = {{Publication}{Publication}}
}
%
@@ -152,68 +154,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/finnish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/finnish-apa.lbx
index 8df87650c8..0e2559833f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/finnish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/finnish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{finnish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{finnish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
% Translations based on:
% https://libguides.oulu.fi/tieteellinentiedonhankinta/apa
@@ -6,6 +6,7 @@
% https://uva.libguides.com/kirjoitusohjeet/esimerkit-APA7
\InheritBibliographyExtras{finnish}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -146,7 +147,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -158,68 +160,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx
index 04b843d241..62e628684d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{french-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{french}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -136,7 +137,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -145,71 +147,89 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx
index 65e3c95bf1..0d9a616654 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx
@@ -1,8 +1,9 @@
-\ProvidesFile{galician-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -154,6 +155,7 @@
beforechrist = {{antes\space de\space Cristo}{a\adddot C\adddot}},
commonera = {{era\space com\'un}{e\adddot c\adddot}},
beforecommonera = {{antes\space da\space era\space com\'un}{a\adddot e\adddot c\adddot}}
+% publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -162,72 +164,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
{}%
- {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
- \mkbibmonth{\thefield{#2}}%
-}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {el\addspace\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {\addspace{en}\addspace}%
- {\iffieldundef{#3}%
- {en\addspace}%
- {\addspace{de}\addspace}%
- \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \thefield{#1}}}}
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
index 56b83de0b8..c0439527cc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{german-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,54 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {german},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -125,9 +200,9 @@
available = {{Erh\"altlich}{Erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -135,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
% annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -151,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
index 3ce1beca9e..55deff23ce 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{greek-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -168,71 +170,89 @@
\else
#1\BibliographyWarning{Month out of range}%
\fi}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \lbx@gr@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \lbx@gr@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \lbx@gr@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx
index 0760cb84aa..19bad1de8a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{italian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -150,68 +152,86 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}%
- \iffieldundef{#1}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\ifthenelse{\iffieldundef{#3}}%
- {\ifthenelse{\iffieldundef{#2}}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx
index 35e2c389bd..ec9190592a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{naustrian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,54 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {naustrian},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Autor}{Aut\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Schriftsteller}{Schriftsteller}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}}
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -125,9 +200,9 @@
available = {{erh\"altlich}{erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -135,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
% annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -151,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
index 766be76849..a53119f813 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{ngerman-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,54 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {ngerman},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
abstract = {{Abstract}{Abstract}},
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
@@ -126,9 +201,9 @@
available = {{Erh\"altlich}{Erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -136,13 +211,64 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
% annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
- nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}}
+ nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -153,139 +279,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
index 89c32580d6..0f413b1a64 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{norsk-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
+\NewBibliographyString{publication}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -98,7 +99,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -108,75 +110,94 @@
% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx
index 2b1a224646..dfb908e142 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{norwegian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
+\NewBibliographyString{publication}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -137,7 +138,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -149,73 +151,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
index 9da8adbda1..fb8861e044 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -65,54 +66,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {nswissgerman},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
- director = {{Regisseur}{Reg\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}}
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -124,9 +199,9 @@
available = {{erh\"altlich}{erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -134,12 +209,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
% annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -150,139 +276,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx
index f9e0e316c3..f0897caef9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{nynorsk-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -138,7 +139,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -150,73 +152,91 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx
index 1dbfefa02b..f8a48b2e1c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{portuguese-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -134,7 +135,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
%
@@ -146,71 +148,90 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \renewcommand{\apashortdash}{~}%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#2}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#3}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \stripzeros{\thefield{#3}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {}%
- {\iffieldundef{#3}%
+ {\iffieldundef{#1}%
{}%
- {\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
- {}%
- {\addspace}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
index fc84c011b8..77ee7f87c0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{russian-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -133,7 +134,8 @@
annodomini = {{нашей\space эры}{н\adddotspace э\adddot}},
beforechrist = {{до\space нашей\space эры}{до н\adddotspace э\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -156,73 +158,91 @@
\fi}%
\DeclareBibliographyExtras{%
- \def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#1}%
+ {}
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx@sl@mkbibmonth{\thefield{#3}}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#1}%
+ {}
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}%
{\addcomma\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx@sl@mkbibmonth{\thefield{#3}}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
- {\mkbibmonth{\thefield{#2}}}%
- {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}%
- \iffieldundef{#1}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
+ {\mkbibmonth{\thefield{#3}}}%
+ {\addspace\lbx@sl@mkbibmonth{\thefield{#3}}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
index d393becabf..1d37d34dd0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{slovene-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -161,7 +162,8 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -185,75 +187,94 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\adddot\addspace}%
- \lbx@sl@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \lbx@sl@mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
index 83bfc65e5d..b4b1f2e724 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
@@ -1,8 +1,9 @@
-\ProvidesFile{spanish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -154,6 +155,7 @@
beforechrist = {{antes\space de\space Cristo}{a\adddot\space C\adddot}},
commonera = {{era\space com\'un}{e\adddot c\adddot}},
beforecommonera = {{antes\space de\space la\space era\space com\'un}{a\adddot e\adddot c\adddot}}
+ % publication = {{Publication}{Publication}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -162,140 +164,90 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#1}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\stripzeros{\thefield{#3}}%
- \iffieldundef{#2}
+ {\stripzeros{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace de\space}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
- {\clearfield{labelmonth}%
- \clearfield{labelday}}
- {}%
- \iffieldundef{#3}%
- {}%
- {el\addspace\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
- {\addspace{en}\addspace}%
- {\iffieldundef{#3}%
- {en\addspace}%
- {\addspace{de}\addspace}%
- \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#2}%
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
{}%
- {\addspace}%
- \thefield{#1}}}%
- \def\apa@lbx@es@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@es@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@es@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@es@mkdaterangeapalongextra{#1}}%
-}
-
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {el\addspace\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {\addspace{en}\addspace}%
+ {\iffieldundef{#4}%
+ {en\addspace}%
+ {\addspace{de}\addspace}%
+ \mkbibmonth{\thefield{#3}}{\addspace{de}\addspace}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx
index bab849a095..95938c6a77 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx
@@ -1,6 +1,7 @@
-\ProvidesFile{swedish-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -142,79 +143,97 @@
% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}}
}
-
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
{\iffieldundef{#1}%
{}
{\addcomma\addspace}%
- \stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ \stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
{}%
- {\iffieldundef{#3}
+ {\iffieldundef{#4}
{\iffieldundef{#1}
{}
{\addspace}}%
{\adddot\addspace}%
- \mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\stripzeros{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\stripzeros{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
index b2730b66f3..7a9b8015dd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
@@ -1,9 +1,10 @@
-\ProvidesFile{swissgerman-apa.lbx}[2021/12/24\space v9.15\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+\NewBibliographyString{publication}
\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
@@ -66,55 +67,128 @@
\NewBibliographyString{charter}
\NewBibliographyString{ofthe}
\NewBibliographyString{tothe}
+\NewBibliographyString{proposed}
+\NewBibliographyString{repealed}
+\NewBibliographyString{execorder}
+\NewBibliographyString{senate}
+\NewBibliographyString{resolution}
+\NewBibliographyString{houseofrepresentatives}
+\NewBibliographyString{report}
+\NewBibliographyString{us}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{constitution}
+\NewBibliographyString{amendment}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
\DeclareBibliographyStrings{%
inherit = {swissgerman},
+ inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
jourarticle = {{Artikel}{Artikel}},
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ tothe = {{zur}{zur}},
+ ofthe = {{der}{der}},
+ unitednations = {{United\space Nations}{U\adddot N\adddot}},
+ charter = {{Charter}{Charter}}, % Let's not translate everything and just capitalize some terms or else we run into problems because we would have to merge some existing definitions (e.g., the two terms "U.N." and "Charter" would actually need to be merged to "U.N.-Charta" for a proper translation).
+ proposed = {{vorgeschlagen}{vorgeschlagen}},
+ repealed = {{ist\space weggefallen\space in}{weggefallen}},
+ execorder = {{Executive\space Order}{Exec\adddot\space Order}},
+ senate = {{Senate}{S\adddot}},
+ resolution = {{Resolution}{Res\adddot}},
+ houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}},
+ report = {{Report}{Rep\adddot}},
+ us = {{U\adddot S\adddot}{U\adddot S\adddot}},
+ southcarolina = {{South\space Carolina}{S\adddot C\adddot}},
+ constitution = {{Constitution}{Const\adddot}},
+ section = {{Paragraph}{§}},
+ amendment = {{Zusatzartikel}{Zusatzart\adddot}},
+ article = {{Artikel}{Art\adddot}},
+ painting = {{Gem\"alde}{Gem\"alde}},
+ present = {{Gegenwart}{Gegenwart}},
+ song = {{Song}{Song}},
+ album = {{Album}{Album}},
+ map = {{Landkarte}{Landkarte}},
+ photograph = {{Foto}{Foto}},
+ photographs = {{Fotos}{Fotos}},
+ powerpoint = {{Power\hyphenate{}Point\hyphen{}Folien}{Power\hyphenate{}Point\hyphen{}Folien}},
% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
- producer = {{Produzent}{Produzent}},
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
-% execproducers = {{Executive\space Producers}{Executive\space Producers}},%FIXME
- director = {{Regisseur}{Regi\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{Autor}{Autor}},
+ podcast = {{Audiopodcast}{Audiopodcast}},
+ podcastepisode = {{Audiopodcastepisode}{Audiopodcastepisode}},
+ interview = {{Interview}{Interview}},
+ speech = {{Sprachaufzeichnung}{Sprachaufzeichnung}},
+ lithograph = {{Lithografie}{Lith\adddot}},
+ video = {{Video}{Video}},
+ film = {{Film}{Film}},
+ tvseries = {{Fernsehserie}{Fernsehserie}},
+ tvepisode = {{Fernsehserienepisode}{Fernsehserienepisode}},
+ narrator = {{Erz\"ahler\addslash\nbhyphen{}in}{Erz\"ahler\addslash\nbhyphen{}in}},
+ narrators = {{erz\"ahlende Personen}{erz\"ahlende Personen}},
+ producer = {{Produz\adddot}{Produz\adddot}},
+ producers = {{Produz\adddot}{Produz\adddot}},
+ execproducer = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execproducers = {{ausf\adddot\space Produz\adddot}{ausf\adddot\space Produz\adddot}},
+ execdirector = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
+ director = {{Reg\adddot}{Reg\adddot}},
+ directors = {{Reg\adddot}{Reg\adddot}},
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
+ host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexpert = {{geladener\space Experte\space /\space geladene\space Expertin}{geladener\space Experte\space /\space geladene\space Expertin}},
% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
+ manunpub = {{unver\"offentlichtes\space Manuskript}{unver\"offentlichtes\space Manuskript}},
+ maninprep = {{Manuskript\space in\space Vorbereitung}{Manuskript\space in\space Vorbereitung}},
+ mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
+ supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
@@ -126,9 +200,9 @@
available = {{erh\"altlich}{erh\"altlich}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
- reviewof = {{Rezension\space des}{Rezension\space des}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ reviewof = {{Resprechung\space des}{Resprechung\space des}}, % "Rezension" isn't wrong, but according to DGP's Richtlinien zur Manuskriptgestaltung this is supposed to be called "Besprechung"
+ paragraph = {{Absatz}{Abs.\adddot}},
+ paragraphs = {{Abs\"atze}{Abs.\adddot}},
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -136,12 +210,63 @@
typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}},
typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}},
typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}},
- typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
- typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+ typevolseries = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
+ typevolseriess = {{Reihen\hyphen und\space Bandherausgeber}{Reihen\hyphen\space\& Bandhrsg\adddot}},
% annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+% publication = {{Publication}{Publication}},
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
@@ -152,139 +277,90 @@
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
- \protected\def\mkbibdateapalong#1#2#3{%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongextra#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#1}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
- \printfield{extradate}%
- \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ \ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\mkbibordinal{\thefield{#4}}%
+ \iffieldundef{#3}
{}
{\addspace}}%
- \iffieldundef{#2}%
+ \iffieldundef{#3}% MONTH
{}%
- {\mkbibmonth{\thefield{#2}}}}%
- \protected\def\mkbibdateapalongmdy#1#2#3{%
+ {\mkbibmonth{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
- \iffieldundef{#3}%
+ \iffieldundef{#2}% YEARDIVISION
{}%
- {\mkbibordinal{\thefield{#3}}}%
- \iffieldundef{#2}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#4}% DAY
{}%
- {\iffieldundef{#3}%
+ {\mkbibordinal{\thefield{#4}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#4}%
{}%
{\addspace}%
- \mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#1}% YEAR
{}%
- {\iffieldundef{#2}%
+ {\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
- \def\apa@lbx@de@mkdaterangeapalong#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\datecircaprint
- \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
- {\printtext{%
- \iffieldsequal{#1year}{#1endyear}
- {\iffieldsequal{#1month}{#1endmonth}
- {\mkbibdateapalongmdy{}{}{#1day}}
- {\mkbibdateapalongmdy{}{#1month}{#1day}}}
- {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
- \dateuncertainprint}}
- {\printtext{%
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalong{#1year}{}{#1day}}%
- {\mkbibdateapalong{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}}%
- \endgroup}%
- \def\apa@lbx@de@mkdaterangeapalongextra#1{%
- \begingroup
- \blx@metadateinfo{#1}%
- \iffieldundef{#1year}{}
- {\printtext{%
- \datecircaprint
- \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
- and test {\iffieldsequal{#1month}{#1endmonth}}}
- {\mkbibdateapalongextra{#1year}{}{#1day}}%
- {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
- \dateeraprint{#1year}%
- \dateuncertainprint
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
- \dateeraprint{#1endyear}}}%
- \enddateuncertainprint}}}%
- \endgroup}%
- \savecommand\mkdaterangeapalong
- \savecommand\mkdaterangeapalongextra
- \def\mkdaterangeapalong{%
- \apa@lbx@de@mkdaterangeapalong}%
- \def\mkdaterangeapalongextra#1{%
- \apa@lbx@de@mkdaterangeapalongextra{#1}}%
-}
+ \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/turkish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/turkish-apa.lbx
new file mode 100644
index 0000000000..fae30835eb
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/turkish-apa.lbx
@@ -0,0 +1,360 @@
+\ProvidesFile{turkish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\InheritBibliographyExtras{turkish}
+
+\NewBibliographyString{publication}
+\NewBibliographyString{jourarticle}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commenton}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{writer}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
+\NewBibliographyString{alabama}
+\NewBibliographyString{alaska}
+\NewBibliographyString{arizona}
+\NewBibliographyString{arkansas}
+\NewBibliographyString{california}
+\NewBibliographyString{colorado}
+\NewBibliographyString{connecticut}
+\NewBibliographyString{delaware}
+\NewBibliographyString{florida}
+\NewBibliographyString{georgia}
+\NewBibliographyString{hawaii}
+\NewBibliographyString{idaho}
+\NewBibliographyString{illinois}
+\NewBibliographyString{indiana}
+\NewBibliographyString{iowa}
+\NewBibliographyString{kansas}
+\NewBibliographyString{kentucky}
+\NewBibliographyString{louisiana}
+\NewBibliographyString{maine}
+\NewBibliographyString{maryland}
+\NewBibliographyString{massachusetts}
+\NewBibliographyString{michigan}
+\NewBibliographyString{minnesota}
+\NewBibliographyString{mississippi}
+\NewBibliographyString{missouri}
+\NewBibliographyString{montana}
+\NewBibliographyString{nebraska}
+\NewBibliographyString{nevada}
+\NewBibliographyString{newhampshire}
+\NewBibliographyString{newjersey}
+\NewBibliographyString{newmexico}
+\NewBibliographyString{newyork}
+\NewBibliographyString{northcarolina}
+\NewBibliographyString{northdakota}
+\NewBibliographyString{ohio}
+\NewBibliographyString{oklahoma}
+\NewBibliographyString{oregon}
+\NewBibliographyString{pennsylvania}
+\NewBibliographyString{rhodeisland}
+\NewBibliographyString{southcarolina}
+\NewBibliographyString{southdakota}
+\NewBibliographyString{tennessee}
+\NewBibliographyString{texas}
+\NewBibliographyString{utah}
+\NewBibliographyString{vermont}
+\NewBibliographyString{virginia}
+\NewBibliographyString{washington}
+\NewBibliographyString{westvirginia}
+\NewBibliographyString{wisconsin}
+\NewBibliographyString{wyoming}
+
+
+\DeclareBibliographyStrings{%
+ inherit = {turkish},
+ jourarticle = {{makale}{makale}},
+% tothe = {{ona}{ona}}, % no certain translation
+% ofthe = {{onun}{onun}}, % no certain translation
+ unitednations = {{Birle\c{s}mi\c{s}\space Milletler}{BM}},
+ charter = {{t\"{u}z\"{u}k}{t\"{u}z\"{u}k}}, % not sure about the translation
+ proposed = {{teklif\space edilmi\c{s}}{teklif\space ed\adddot}},
+ repealed = {{feshedilmi\c{s}}{fesih\space ed\adddot}},
+ execorder = {{\"{u}st\space karar}{\"{u}st\space karar}},
+ senate = {{senato}{senato}},
+ resolution = {{\c{c}\"{o}z\"{u}m}{\c{c}\"{o}z\adddot}},
+ houseofrepresentatives = {{temsilciler\space meclisi}{tem\adddotspace mec\adddot}},
+ report = {{rapor}{rapor}},
+ us = {{Amerika\space Birle\c{s}ik\space Devletleri}{ABD}},
+ constitution = {{anayasa}{anayasa}},
+ section = {{b\"{o}l\"{u}m}{b\"{o}l\adddot},
+ amendment = {{yasa\space de\u{g}i\c{s}ikli\u{g}i}{yasa\space de\u{g}\adddot}},
+ article = {{makale}{makale}},
+ painting = {{resim}{resim}},
+ present = {{sunum}{sunum}}, %not sure about the translation
+ song = {{\c{s}ark\i}}{\c{s}ark\i}},
+ album = {{alb\"{u}m}{alb\"{u}m}},
+ map = {{harita}{harita}},
+ photograph = {{foto\u{g}raf}{foto\u{g}raf}},
+ photographs = {{foto\u{g}raflar}{foto\u{g}raflar}},
+ powerpoint = {{sunum\space slaytlar\i}{sun\adddotspace slayt\adddot}},
+ lecturenotes = {{notlar}{not\adddot}},
+ podcast = {{ses\space kayd\i}{ses\space kay\adddot}},
+ podcastepisode = {{ses\space kay\i t\space b\"{o}l\"{u}m\"{u}}{ses\space kay\adddotspace b\"{o}l\adddot}},
+ interview = {{m\"{u}lakat]}{m\"{u}lakat}},
+ speech = {{konu\c{s}ma}{konu\c{s}ma}},
+ lithograph = {{litografi}{litografi}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space dizisi}{TV\space dizisi}},
+ tvepisode = {{TV\space dizi\space b\"{o}l\"{u}m\"{u}}{TV\space dizi\space b\"{o}l\adddot}},
+ narrator = {{seslendiren]}{ses\adddot}},
+ narrators = {{seslendirenler}{ses\adddot}},
+ producer = {{yap\i mc \i}{yap\adddot}},
+ producers = {{yap\i mc \i lar}{yap\adddot}},
+ execproducer = {{\"{u}st\space yap\i mc \i}{\"{u}st\space yap\adddot}},
+ execproducers = {{\"{u}st\space yap\i mc \i lar}{\"{u}st\space yap\adddot}},
+ execdirector = {{\"{u}st\space y\"{o}netmen}{\"{u}st\space y\"{o}n\adddot}},
+ execdirectors = {{\"{u}st\space y\"{o}netmenler}{\"{u}st\space y\"{o}n\adddot}},
+ director = {{y\"{o}netmen}{y\"{o}n\adddot}},
+ directors = {{y\"{o}netmenler}{y\"{o}n\adddot}},
+ writer = {{yazar}{yazar}},
+ writers = {{yazarlar}{yazarlar}},
+ host = {{ev\space sahibi}{ev\space sah\adddot}},
+ hosts = {{ev\space sahipleri]}{ev\space sah\adddot}},
+ guestexpert = {{misafir\space uzman}{mis\adddotspace uzm\adddot}},
+ guestexperts = {{misafir\space uzmanlar}{mis\adddotspace uzm\adddot}},
+ with = {{ile}{ile}},
+ manunpub = {{metin\space yay\i mlanmam\i \c{s}}{met\adddotspace yay\i mlanmam\i \c{s}}},
+ maninprep = {{metin\space haz\i rl\i k\space a\c{s}amas\i nda}{met\adddotspace haz\adddotspace a\c{s}a\adddot}},
+ mansub = {{yay\i mlanmak\space i\c{c}in\space g\"{o}nderilmi\c{s}\space metin}{yay\adddotspace i\c{c}in\space g\"{o}n\adddotspace met\adddot}},
+ supplement = {{ek}{ek}},
+ part = {{par\c{c}a}{par\adddot}},
+ andothers = {{ve\space di\u{g}erleri}{ve\space di\u{g}\adddot}},
+ revisededition = {{G\"{o}zden\space ge\c{c}irilmi\c{s}\space bas\i m}{G\"{o}z\adddotspace ge\c{c}\adddotspace bs\adddot}},
+ commenton = {{yorum}{yrm\adddot}}, %not sure about the translation
+ page = {{sayfa}{{}s\adddot}},
+ pages = {{sayfalar}{{}ss\adddot}},
+ on = {{tarihinde}{tar\adddot}},
+ retrieved = {{eri\c{s}im\space tarihi}{eri\c{s}im\space tarihi}},
+ available = {{Haz\i r}{Haz\i r}},
+% from = {{from}{from}}, % there are two forms of "from" in Turkish. not sure to include just one.
+ archivedat = {{ar\c{s}ivde}{ar\c{s}iv\adddot}},
+ reprintas = {{yeni\space bask\i s\i}{yeni\space bs\adddot}},
+ reprintfrom = {{yeni\space bask\i s\i}{yeni\space bs\adddot}},
+ reviewof = {{derleme\space eser}{der\adddotspace eser}},
+ paragraph = {{paragraf}{par\adddot}},
+ paragraphs = {{paragraflar}{Par\adddot}},
+ mathesis = {{y\"{u}ksek\space lisans\space tezi}{Y\adddotspace L\adddotspace tezi}},
+ phdthesis = {{doktora\space tezi}{dok\adddotspace tezi}},
+ origyear = {{as\i l\space eser\space yay\i n\space tarihi}{as\i l\space eser\space yay\i n\space tarihi}},
+ typechair = {{ba\c{s}kan}{ba\c{s}\adddot}},
+ typechairs = {{ba\c{s}kanlar}{ba\c{s}\adddot}},
+ typevolume = {{cilt\space edit\"{o}r\"{u}}{cilt\space ed\adddot}},
+ typevolumes = {{cilt\space edit\"{o}rleri}{cilt\space ed\adddot}},
+ typeseries = {{seri\space edit\"{o}r\"{u}}{seri\space ed\adddot}},
+ typeseriess = {{seri\space edit\"{o}rleri}{seri\space ed\adddot}},
+ typevolseries = {{cilt\space ve\space seri\space edit\"{o}r\"{u}}{cilt\space\& seri\space ed\adddot}},
+ typevolseriess = {{cilt\space ve\space seri\space edit\"{o}rleri}{cilt\space\& seri\space ed\adddot}},
+ annodomini = {{milattan\space sonra}{M\adddotspace S\adddot}},
+ beforechrist = {{milattan\space \"{o}nce}{M\adddotspace \"{O}\adddot}},
+ commonera = {{milattan\space sonra}{M\adddotspace S\adddot}},
+ beforecommonera = {{milattan\space \"{o}nce}{M\adddotspace \"{O}\adddot}},
+ publication = {{yay\i n}{yay\i n}}
+ alabama = {{Alabama}{{A\adddot L\adddot}}},
+ alaska = {{Alaska}{{A\adddot K\adddot}}},
+ arizona = {{Arizona}{{A\adddot Z\adddot}}},
+ arkansas = {{Arkansas}{{A\adddot R\adddot}}},
+ california = {{California}{{C\adddot A\adddot}}},
+ colorado = {{Colorado}{{C\adddot O\adddot}}},
+ connecticut = {{Connecticut}{{C\adddot T\adddot}}},
+ delaware = {{Delaware}{{D\adddot E\adddot}}},
+ florida = {{Florida}{{F\adddot L\adddot}}},
+ georgia = {{Georgia}{{G\adddot A\adddot}}},
+ hawaii = {{Hawaii}{{H\adddot I\adddot}}},
+ idaho = {{Idaho}{{I\adddot D\adddot}}},
+ illinois = {{Illinois}{{I\adddot L\adddot}}},
+ indiana = {{Indiana}{{I\adddot N\adddot}}},
+ iowa = {{Iowa}{{I\adddot A\adddot}}},
+ kansas = {{Kansas}{{K\adddot S\adddot}}},
+ kentucky = {{Kentucky}{{K\adddot Y\adddot}}},
+ louisiana = {{Louisiana}{{L\adddot A\adddot}}},
+ maine = {{Maine}{{M\adddot E\adddot}}},
+ maryland = {{Maryland}{{M\adddot D\adddot}}},
+ massachusetts = {{Massachusetts}{{M\adddot A\adddot}}},
+ michigan = {{Michigan}{{M\adddot I\adddot}}},
+ minnesota = {{Minnesota}{{M\adddot N\adddot}}},
+ mississippi = {{Mississippi}{{M\adddot S\adddot}}},
+ missouri = {{Missouri}{{M\adddot O\adddot}}},
+ montana = {{Montana}{{M\adddot T\adddot}}},
+ nebraska = {{Nebraska}{{N\adddot E\adddot}}},
+ nevada = {{Nevada}{{N\adddot V\adddot}}},
+ newhampshire = {{New Hampshire}{{N\adddot H\adddot}}},
+ newjersey = {{New Jersey}{{N\adddot J\adddot}}},
+ newmexico = {{New Mexico}{{N\adddot M\adddot}}},
+ newyork = {{New York}{{N\adddot Y\adddot}}},
+ northcarolina = {{North Carolina}{{N\adddot C\adddot}}},
+ northdakota = {{North Dakota}{{N\adddot D\adddot}}},
+ ohio = {{Ohio}{{O\adddot H\adddot}}},
+ oklahoma = {{Oklahoma}{{O\adddot K\adddot}}},
+ oregon = {{Oregon}{{O\adddot R\adddot}}},
+ pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}},
+ rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}},
+ southcarolina = {{South Carolina}{{S\adddot C\adddot}}},
+ southdakota = {{South Dakota}{{S\adddot D\adddot}}},
+ tennessee = {{Tennessee}{{T\adddot N\adddot}}},
+ texas = {{Texas}{{T\adddot X\adddot}}},
+ utah = {{Utah}{{U\adddot T\adddot}}},
+ vermont = {{Vermont}{{V\adddot T\adddot}}},
+ virginia = {{Virginia}{{V\adddot A\adddot}}},
+ washington = {{Washington}{{W\adddot A\adddot}}},
+ westvirginia = {{West Virginia}{{W\adddot V\adddot}}},
+ wisconsin = {{Wisconsin}{{W\adddot I\adddot}}},
+ wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
+}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Drop end* when they are the same as *
+% You must use \print*date to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/biblatex/CHANGES.md b/macros/latex/contrib/biblatex/CHANGES.md
index 9e6034eac4..b79faf7faf 100644
--- a/macros/latex/contrib/biblatex/CHANGES.md
+++ b/macros/latex/contrib/biblatex/CHANGES.md
@@ -1,3 +1,15 @@
+# RELEASE NOTES FOR VERSION 3.18
+- New sorting name key generation macro `\visibility` which allows
+ application of sorting name key generation to apply only to sorting
+ within citations.
+- New sorting macro `\intciteorder` which allows sorting by order internal
+ to a cite command like \cite{a,b,c}.
+- New option `pluralothers` to force "et al" to be plural (i.e. only
+ replace two or more names). This is required for some styles (e.g. APA)
+- Added `\localrefcontext` as a local alternative
+ to the global `\newrefcontext`.
+ `\localrefcontext` can be nested and is only active in the current group.
+
# RELEASE NOTES FOR VERSION 3.17
- **INCOMPATIBLE CHANGE**
The behaviour of index-less granular xdata references to list fields has
diff --git a/macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst b/macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst
index 06e60bb887..6cd54a3486 100644
--- a/macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst
+++ b/macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst
@@ -184,7 +184,7 @@ STRINGS { ctrl.alphaothers ctrl.sortalphaothers ctrl.sortstr
last.name last.hash last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 3.17 $"
+ "$Revision: 3.18 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
@@ -1928,7 +1928,7 @@ FUNCTION {input:control:options} {
% This version corresponds to the .bcf version, *not* the biblatex version!
FUNCTION {input:control:version} {
input:control:parse
- "$Revision: 3.8 $"
+ "$Revision: 3.9 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
'tempstrga :=
diff --git a/macros/latex/contrib/biblatex/doc/biblatex.pdf b/macros/latex/contrib/biblatex/doc/biblatex.pdf
index 6dd284f9f4..4157c6667d 100644
--- a/macros/latex/contrib/biblatex/doc/biblatex.pdf
+++ b/macros/latex/contrib/biblatex/doc/biblatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex/doc/biblatex.tex b/macros/latex/contrib/biblatex/doc/biblatex.tex
index e3194961d0..24e8335b47 100644
--- a/macros/latex/contrib/biblatex/doc/biblatex.tex
+++ b/macros/latex/contrib/biblatex/doc/biblatex.tex
@@ -68,7 +68,7 @@
url={\biblatexhome},
author={Philip Kime, Moritz Wemheuer, Philipp Lehman},
email={},
- revision={3.17},
+ revision={3.18},
date={\today}}
\hypersetup{%
@@ -1757,7 +1757,7 @@ Date fields such as the default data model dates \bibfield{date}, \bibfield{orig
\acr{ISO8601-2} Extended Format dates are astronomical dates in which year <0> exists. When outputting dates in BCE or BC era (see the \opt{dateera} option below), note that they will typically be one year earlier since BCE/BC era do not have a year 0 (year 0 is 1 BCE/BC). This conversion is automatic. See examples in \tabref{bib:use:tab2}.
-Date field names \emph{must} end with the string <date>, as with the default date fields. Bear this in mind when adding new date fields to the datamodel (see \secref{aut:ctm:dm}). \biblatex will check all date fields after reading the date model and will exit with an error if it finds a date field which does not adhere to this naming convention.
+Date field names \emph{must} end with the string <date>, as with the default date fields. Bear this in mind when adding new date fields to the datamodel (see \secref{aut:ctm:dm}). \biblatex will check all date fields after reading the data model and will exit with an error if it finds a date field which does not adhere to this naming convention.
\acr{ISO8601-2} supports dates before common era (BCE/BC) by way of a negative date format and supports <approximate> (circa) and uncertain dates. Such date formats set internal markers which can be tested for so that appropriate localised markers (such as \opt{circa} or \opt{beforecommonera}) can be inserted. Also supported are <unspecified> dates (\acr{ISO8601-2} 4.3) which are automatically expanded into appropriate data ranges accompanied by a field \bibfield{$<$datetype$>$dateunspecified} which details the granularity of the unspecified data. Styles may use this information to format such dates appropriately but the standard styles do not do this. See \tabref{bib:use:tab3} on page~\pageref{bib:use:tab3} for the allowed \acr{ISO8601-2} <unspecified> formats, their range expansions and \bibfield{$<$datetype$>$dateunspecified} values (see \secref{aut:bbx:fld:gen}).
@@ -2146,6 +2146,13 @@ Whether or not to sort citations if multiple entry keys are passed to a citation
Whether or not to sort set members according to the active reference context sorting scheme. By default this is false and set members appear in the order given in the data source.
+\boolitem[false]{pluralothers}
+
+Controls whether the localised <and others> string (e.g. <et al>) is forced
+to be plural. If true, it will only be printed in place of two or more
+names and if there is only one name it would replace, the name itself is
+printed instead. Defaults to false.
+
\intitem[3]{maxnames}
A threshold affecting all lists of names (\bibfield{author}, \bibfield{editor}, etc.). If a list exceeds this threshold, \ie if it holds more than \prm{integer} names, it is automatically truncated according to the setting of the \opt{minnames} option. \opt{maxnames} is the master option which sets \opt{maxbibnames}, \opt{maxcitenames} and \opt{maxsortnames}. Note that the \opt{uniquelist} feature can locally override \opt{maxnames}, see the documentation of the \opt{uniquelist} option in \secref{use:opt:pre:int} and \secref{aut:cav:amb}.
@@ -4345,6 +4352,11 @@ The \opt{refcontext} environment cannot be nested and \biblatex will generate an
\cmditem{newrefcontext}[key=value, \dots]{name}
This command is similar to the \env{refcontext} environment except that it is a stand"=alone command rather than an environment. It automatically ends any previous reference context section begun with \cmd{newrefcontext} (if any) and immediately starts a new one. Note that the context section started by the last \cmd{newrefcontext} command in the document will extend to the very end of the document. Use \cmd{endrefcontext} if you want to terminate it earlier.
+
+\cmditem{localrefcontext}[key=value, \dots]{name}
+
+This command is similar to the \env{newrefcontext} command except that it sets up the reference context only locally.
+This is useful if the reference context needs to be changed within a group. There is no need to end a local reference context, it will automatically be reset once the group ends.
\end{ltxsyntax}
%
At the beginning of the document, there is always a global context containing global settings for each of the reference context options. Here is an example summarising the reference contexts with various settings:
@@ -4454,6 +4466,12 @@ Here, the data for the citation of \bibfield{key2} will be drawn from the refcon
%
Here, the data for the citation of \bibfield{key2} will be drawn from refcontext with \opt{labelprefix=C} and not \opt{labelprefix=A} since the explicit options override the named refcontext (resulting in a label with prefix <C> and not <A> or <B>).
+\begin{ltxsyntax}
+\cmditem{GenRefcontextData}{key=value, \dots}
+
+This command takes the same key/value options as \cmd{DeclareRefcontext}. It forces the currently active refcontext, optionally modified by the key/value options, to be written to the \file{.bcf} so that \biber will create a sorted data list for the specified refcontext. Normally this is automatic when \cmd{printbibliography}/\cmd{prinbiblist} is used in a reference context but there are situations where the data for a refcontext will be needed but no reference list is generated in that context e.g. to sort citations with the \opt{sortcites} option when the sorting of citations requires a different refcontext to that used for the actual reference list.
+\end{ltxsyntax}
+
\subsubsection{Dynamic Entry Sets}
\label{use:bib:set}
@@ -5006,7 +5024,7 @@ The commands and facilities presented in this section may be used to adapt the f
\subsubsection{Generic Commands and Hooks}
\label{use:fmt:fmt}
-The commands in this section may be redefined with \cmd{renewcommand} in the document preamble. Those marked as <Context Sensitive> in the margin can also be customised with \cmd{DeclareDelimFormat} and are printed with \cmd{printdelim} (\secref{use:fmt:csd}). Note that all commands starting with \cmd{mk\dots} take one argument. All of these commands are defined in \path{biblatex.def}.
+The commands in this section may be redefined with \cmd{renewcommand} in the document preamble. Those marked as <Context Sensitive> in the margin can also (and generally should) be customised with \cmd{DeclareDelimFormat} and are printed with \cmd{printdelim} (\secref{use:fmt:csd}). Note that all commands starting with \cmd{mk\dots} take one argument. All of these commands are defined in \path{biblatex.def}.
\begin{ltxsyntax}
@@ -5092,7 +5110,7 @@ This command should be used with \cmd{bibnamedelimd} as a reversed-name separato
The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references.
\csitem{labelnamepunct}\DeprecatedMark
-A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} in the \texttt{bib} context with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}, e.g.
+A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} in the \texttt{bib} context with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}, \eg
\begin{ltxexample}
\DeclareDelimFormat[bib]{nametitledelim}{%
\addcolon\space}
@@ -5325,8 +5343,9 @@ The separator between the block of related entries of type <relatedtype>. There
\subsubsection{Context-sensitive Delimiters}
\label{use:fmt:csd}
-The delimiters described in \secref{use:fmt:fmt} are globally defined. That is, no matter where you use them, they print the same thing. This is not necessarily desirable for delimiters which you might want to print different things in different contexts. Here <context> means things like <inside a text citation> or <inside a bibliography item>. For this reason, \biblatex\ provides a more sophisticated delimiter specification and user interface alongside the standard one based on normal macros defined with \cmd{newcommand}.
+Many delimiters described in \secref{use:fmt:fmt} are globally defined. That is, no matter where you use them, they print the same thing. This is not necessarily desirable for delimiters which you might want to print different things in different contexts. Here <context> means things like <inside a text citation> or <inside a bibliography item>. For this reason, \biblatex\ provides a more sophisticated delimiter specification and user interface alongside the standard one based on normal macros defined with \cmd{newcommand}.
+ For backwards compatibility reasons all context-sensitive delimiters (\ie all delimiters marked as <context sensitive> in \secref{use:fmt:fmt}) can be redefined with \cmd{renewcommand} in the global context. It is, however, strongly recommended to use the interface documented below (primarily \cmd{DeclareDelimFormat}) to redefine these delimiters---even if \cmd{renewcommand} would suffice for the job at hand.
\begin{ltxsyntax}
\cmditem{DeclareDelimFormat}[context, \dots]{name}{code}
@@ -5420,7 +5439,7 @@ This means that \cmd{nametitledelim} is defined globally as <\cmd{addcomma}\cmd{
\printdelim[textcite]{nametitledelim}
\end{ltxexample}
%
-Would print \cmd{addspace} regardless of the surrounding context of the \cmd{printdelim}. Contexts are just arbitrary strings and so you can establish them at any time, using \cmd{delimcontext}. If \cmd{printdelim} finds no special value for the delimiter \prm{name} in the current context, it simply prints \cmd{name}. This means that style authors can use \cmd{printdelim} and users expecting to be able to use \cmd{renewcommand} to redefine delimiters can do so with one caveat---such a definition won't change any context-specific delimiters which are defined:
+would print \cmd{addspace} regardless of the surrounding context of the \cmd{printdelim}. Contexts are just arbitrary strings and so you can establish them at any time, using \cmd{delimcontext}. If \cmd{printdelim} finds no special value for the delimiter \prm{name} in the current context, it simply prints \cmd{name}. This means that style authors can use \cmd{printdelim} and users expecting to be able to use \cmd{renewcommand} to redefine delimiters can do so with one caveat---such a definition won't change any context-specific delimiters which are defined:
\begin{ltxexample}[style=latex]
\DeclareDelimFormat{delima}{X}
@@ -6482,7 +6501,7 @@ All \latex environments enclosed in \cmd{begin} and \cmd{end} form a group. This
<<\endrefsection>>
\end{ltxexample}
%
-This will not from a group, but otherwise works as usual. As far as \biblatex is concerned, it does not matter which syntax you use. The alternative syntax is also supported by the \env{refsegment} environment. Note that the commands \cmd{newrefsection} and \cmd{newrefsegment} do not form a group. See \secref{use:bib:sec, use:bib:seg} for details.
+This will not form a group, but otherwise works as usual. As far as \biblatex is concerned, it does not matter which syntax you use. The alternative syntax is also supported by the \env{refsegment} environment. Note that the commands \cmd{newrefsection} and \cmd{newrefsegment} do not form a group. See \secref{use:bib:sec, use:bib:seg} for details.
\subsection{Using the fallback \bibtex\ backend}
\label{use:bibtex}
@@ -9344,7 +9363,7 @@ The \prm{specification} is an undelimited list of \cmd{sort} directives which sp
\cmditem{sort}{elements}
-Specifies the elements considered in the sorting process. The \prm{elements} are an undelimited list of \cmd{field}, \cmd{literal}, \cmd{citecount} and \cmd{citeorder} commands which are evaluated in the order in which they are given. If an element is defined, it is added to the sort key and the sorting routine skips to the next \cmd{sort} directive. If it is undefined, the next element is evaluated. Since literal strings are always defined, any \cmd{literal} commands should be the sole or the last element in a \cmd{sort} directive. All \prm{elements} should be the same datatype as described in \secref{bib:fld:dat} since they will be potentially compared to any of the other \prm{elements} in other entries.. The \cmd{sort} command supports the following optional arguments:
+Specifies the elements considered in the sorting process. The \prm{elements} are an undelimited list of \cmd{field}, \cmd{literal}, \cmd{citecount}, \cmd{intciteorder} and \cmd{citeorder} commands which are evaluated in the order in which they are given. If an element is defined, it is added to the sort key and the sorting routine skips to the next \cmd{sort} directive. If it is undefined, the next element is evaluated. Since literal strings are always defined, any \cmd{literal} commands should be the sole or the last element in a \cmd{sort} directive. All \prm{elements} should be the same datatype as described in \secref{bib:fld:dat} since they will be potentially compared to any of the other \prm{elements} in other entries.. The \cmd{sort} command supports the following optional arguments:
\begin{optionlist*}
@@ -9417,7 +9436,7 @@ The \cmd{citeorder} element has a special meaning. It requests a sort based on t
there is a distinction between the lexical order and the semantic order. Here «one» and «two» have the same semantic order but a unique lexical order. The semantic order only matters if you specify further sorting to disambiguate entries with the same semantic order. For example, this is the definition of the \opt{none} sorting template:
\begin{ltxexample}
-\DeclareSortingTemplate{none}{
+\DeclareSortingTemplate{lexical}{
\sort{\citeorder}
}
\end{ltxexample}
@@ -9425,7 +9444,7 @@ there is a distinction between the lexical order and the semantic order. Here «
This sorts the bibliography purely lexically by the order of the keys in the citation commands. In the example above, it sorts «one» before «two». However, suppose that you consider «one» and «two» to have the same order (semantic order) since they are cited at the same time and want to further sort these by year. Suppose «two» has an earlier \bibfield{year} than «one»:
\begin{ltxexample}
-\DeclareSortingTemplate{noneyear}{
+\DeclareSortingTemplate{lexicalyear}{
\sort{\citeorder}
\sort{<<year>>}
}
@@ -9433,6 +9452,25 @@ This sorts the bibliography purely lexically by the order of the keys in the cit
%
This sorts «two» before «one», even though lexically, «one» would sort before «two». This is possible because the semantic order can be disambiguated by the further sorting on year. With the standard \opt{none} sorting template, the lexical order and semantic order are identical because there is nothing further to disambiguate them. This means that you can use \cmd{citeorder} just like any other sorting specification element, choosing how to further sort entries cited at the same time (in the same citation command).
+See also \cmd{intciteorder} below.
+
+\csitem{intciteorder}
+
+The \cmd{intciteorder} element has a special meaning. It requests a sort based on the lexical order internal to the same citation command. For example:
+
+\begin{ltxexample}
+\cite{one,two}
+\end{ltxexample}
+%
+Here both citations have the same \cmd{citeorder} but different \cmd{intciteorder}. This sorting command is basically a more granular form of \cmd{citeorder} so that order can be distinguished for citations within the same citation command. So, for example, with the above example, this will guarantee sorting of <one> before <two>:
+
+\begin{ltxexample}
+\DeclareSortingTemplate{fulllexical}{
+ \sort{\citeorder}
+ \sort{\intciteorder}
+}
+\end{ltxexample}
+
\cmditem{DeclareSortingNamekeyTemplate}[name]{specification}
Defines how the sorting keys for names are constructed. This can change the sorting order of names arbitrarily because you can choose how to put together the name parts when constructing the string to compare when sorting. The sorting key construction template so defined is called \prm{name} which defaults to «global» if this optional parameter is absent. When constructing the sorting key for a name, a sorting key for each name part is constructed and the key for each name is formed into an ordered key list with a special internal separator. The point of this option is to accommodate languages or situations where sorting of names needs to be customised (for example, Icelandic names are sometimes sorted by given names rather than by family names). This macro may be used multiple times to define templates with different names which can then be referred to later. Sorting name key templates can be specified at the following scopes, in order of increasing precedence:
@@ -9465,7 +9503,49 @@ By default there is only a global template which has the following \prm{specific
}
\end{ltxexample}
%
-This means that the key is constructed by concatenating, in order, the name prefix (only if the \opt{useprefix} option is true) with the family name(s), the given names(s), the name suffix and then the name prefix (only if the \opt{useprefix} option is false).
+This means that the key is constructed by concatenating, in order, the name prefix (only if the \opt{useprefix} option is true) with the family name(s), the given names(s), the name suffix and then the name prefix (only if the \opt{useprefix} option is false). The visible number of names in the name list used to construct the key is the default sorting visibility, see below.
+
+\cmditem{visibility}{visibilityscope}
+
+\prm{visibilityscope} determines which visibility settings to use for the name list. This determines how many names in the name list are visible to the sorting algorithm. This is by default set to <sort>, which is the standard visibility for sorting determined by the \opt{max*/min*names} and \opt{uniquelist} options. \cmd{visibility} can be omitted entirely if this default is desired. The only other scope is <cite> which forces the sorting algorithm to use the name list visibility of the citations rather than that of the reference list sorting. This is useful when using the \opt{sortcites} option in the situation when a style has different name list truncation rules for citations than it has for the reference list. Citations can then be forced to sort using a different reference context that uses a modified sorting name key template that enforces the correct name list truncation for citation sorting with:
+
+\begin{ltxexample}
+\DeclareSortingNamekeyTemplate[mycitesorttemplate]{
+ \visibilty{cite}
+ .
+ .
+ .
+\end{ltxexample}
+%
+and then force this to be used with e.g.:
+
+\begin{ltxexample}
+ \newrefcontext[sortingnamekeytemplate=mycitesorttemplate]
+ \cite{a,b,c}
+\end{ltxexample}
+%
+One thing to note is that a reference context will not be written to the \file{.bcf} if no \cmd{printbibliography} or \cmd{printbiblist} occurs within it which will mean that \biber will not generate any sorted data for the refcontext. Therefore if the requirement is to just correctly sort citations using this refcontext, you will need to force the writing of the refcontext using \cmd{GenRefcontextData} (see \secref{use:bib:context}):
+
+\begin{ltxexample}
+ % make sure sorting data using this template is
+ % generated since no \printbibliography/\printbiblist
+ % occurs in the refcontext with
+ % sortingnamekeytemplatename=mycitesorttemplate,
+ % this won't happen by default
+ \GenRefcontextData{sortingnamekeytemplatename=mycitesorttemplate}
+ % Switch to this refcontext to use the correct
+ % sorted data using the sorting name key template
+ % which uses "cite" visibility for the name lists
+ \newrefcontext[sortingnamekeytemplate=mycitesorttemplate]
+ % citations are correctly sorted
+ \cite{a,b,c}
+ % Switch to the default sorting name key template
+ % for the actual list of references which uses the
+ % default sorting visibility for the name lists
+ \newrefcontext[sortingnamekeytemplate=global]
+ % references are correctly sorted
+ \printbibliography
+\end{ltxexample}
\cmditem{keypart}{part}
@@ -9497,7 +9577,7 @@ constructing the sorting specification.
As an example, suppose you wanted to be able to sort names by given name rather than family name, you could define a sorting name key template like this:
\begin{ltxexample}
-\DeclareSortingNamekeyTemplate[givenfirst]{
+\DeclareNamekeyTemplate[givenfirst]{
\keypart{
\namepart{<<given>>}
}
@@ -12507,7 +12587,12 @@ The punctuation to be printed between the given and family name parts when a nam
The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references.
\csitem{labelnamepunct}\DeprecatedMark
-A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}.
+A separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined) instead of \cmd{newunitpunct}. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. This punctuation command is deprecated and has been superseded by the context-sensitive \cmd{nametitledelim} (see \secref{use:fmt:csd}). For backwards compatibility reasons, however, \cmd{nametitledelim} still defaults to \cmd{labelnamepunct} in the \texttt{bib} and \texttt{biblist} contexts. Style authors may want to consider replacing \cmd{labelnampunct} with \texttt{\textbackslash printdelim\{nametitledelim\}} and users may want to prefer modifying the context-sensitive \texttt{nametitledelim} with \cmd{DeclareDelimFormat} over redefining \cmd{labelnamepunct}, \eg
+\begin{ltxexample}
+\DeclareDelimFormat[bib]{nametitledelim}{%
+ \addcolon\space}
+\end{ltxexample}
+
\csitem{subtitlepunct}
The separator to be printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration.
@@ -12576,16 +12661,16 @@ Similar to \cmd{multicitedelim}, but intended for citation styles that <compress
Similar to \cmd{multicitedelim}, but intended for \cmd{textcite} and related commands (\secref{use:cit:cbx}). The default is a comma plus an interword space. The standard styles modify this provisional definition to ensure that the delimiter before the final citation is the localised term <and>, separated by interword spaces.
\csitem{nametitledelim}\CSdelimMark
-The delimiter to be printed between the author\slash editor and the title. This command should be incorporated in the definition of all citation commands of author-title and some verbose citation styles and in the bibliography drivers---in author-year bibliographies \cs{nametitledelim} may be printed between the author\slash editor-year block and the title. The default definition inside bibliographies is the now deprecated \cmd{labelnamepunct} (for backwrds compatibility reasons) and is a comma plus an interword space otherwise.
+The delimiter to be printed between the author\slash editor and the title. This command should be incorporated in the definition of all citation commands of author-title and some verbose citation styles and in the bibliography drivers---in author-year bibliographies \cs{nametitledelim} may be printed between the author\slash editor-year block and the title. The default definition inside bibliographies (\ie in the \texttt{bib} and \texttt{biblist} contexts) is the now deprecated \cmd{labelnamepunct} (for backwards compatibility reasons), in \texttt{textcite} context it is a space and it is a comma plus an interword space otherwise.
\csitem{nameyeardelim}\CSdelimMark
-The delimiter to be printed between the author\slash editor and the year. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space.
+The delimiter to be printed between the author\slash editor and the year. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space. For backwards compatibility reasons there are separate definitions in the \texttt{bib}, \texttt{biblist}, \texttt{textcite} and global context.
\csitem{namelabeldelim}\CSdelimMark
The delimiter printed between the name\slash title and the label. This command should be incorporated in the definition of all citation commands of alphabetic and numeric citation styles. The default definition is an interword space.
\csitem{nonameyeardelim}\CSdelimMark
-The delimiter printed between the substitute for the labelname when it does not exist (usually the label or title in standard styles) and the year citation styles and the bibliography drivers. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space.
+The delimiter printed between the substitute for the labelname when it does not exist (usually the label or title in standard styles) and the year citation styles and the bibliography drivers. This command should be incorporated in the definition of all citation commands of author-year citation styles and in the bibliography drivers. The default definition is an interword space. For backwards compatibility reasons there are separate definitions in the \texttt{bib}, \texttt{biblist}, \texttt{textcite} and global context.
\csitem{authortypedelim}\CSdelimMark
The delimiter printed between the author and the \texttt{authortype}. The default is a comma followed by a space.
@@ -13178,6 +13263,10 @@ The name of the name list currently being processed by \cmd{printnames}. This in
\begin{ltxsyntax}
+\cmditem{AtBeginRefsection}{code}
+
+Appends the \prm{code} to an internal hook executed at the beginning of every reference section. The \prm{code} is executed just after setting the reference section number. This command may only be used in the preamble.
+
\cmditem{AtBeginBibliography}{code}
Appends the \prm{code} to an internal hook executed at the beginning of the bibliography. The \prm{code} is executed at the beginning of the list of references, immediately after the \prm{begin code} of \cmd{defbibenvironment}. This command may only be used in the preamble.
@@ -14766,6 +14855,14 @@ use$<$name$>$ &\+&\+&\_&\+&\+&\_&\_\\
This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. More technical details are to be found in the \file{CHANGES.md} file. The numbers on the right indicate the relevant section of this manual.
\begin{changelog}
+\begin{release}{3.18}{2022-06-22}
+\item Added sorting option \cmd{intciteorder}\see{aut:ctm:srt}
+\item Added global option \opt{pluralothers}\see{use:opt:pre:gen}
+\item Added \cmd{localrefcontext}\see{use:bib:context}
+\item Added \cmd{visibility} option to \cmd{DeclareSortingNamekeyTemplate}\see{aut:ctm:srt}
+\item Added \cmd{GenRefcontextData}\see{use:bib:context}
+\item Added \cmd{AtBeginRefsection}\see{aut:fmt:hok}
+\end{release}
\begin{release}{3.17}{2022-01-25}
\item Changed behaviour of index-less granular XDATA references\see{use:use:xdat}
\item Added \cmd{DeclareNonamestring} \see{aut:ctm:nonamestring}
diff --git a/macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdf b/macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdf
index 341968dbcb..17ccb35690 100644
--- a/macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdf
+++ b/macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex/latex/biblatex.def b/macros/latex/contrib/biblatex/latex/biblatex.def
index 58c7414182..8e52b7fa0d 100644
--- a/macros/latex/contrib/biblatex/latex/biblatex.def
+++ b/macros/latex/contrib/biblatex/latex/biblatex.def
@@ -1472,6 +1472,7 @@
\DeclareSortingTemplate{none}{
\sort{\citeorder}
+ \sort{\intciteorder}
}
\DeclareSortingTemplate{count}{
diff --git a/macros/latex/contrib/biblatex/latex/biblatex.sty b/macros/latex/contrib/biblatex/latex/biblatex.sty
index afafd19134..d21d369757 100644
--- a/macros/latex/contrib/biblatex/latex/biblatex.sty
+++ b/macros/latex/contrib/biblatex/latex/biblatex.sty
@@ -12,8 +12,8 @@
% particular purpose.
% Set up the version strings here
-\def\abx@date{2022/02/02}
-\def\abx@version{3.17}
+\def\abx@date{2022/06/22}
+\def\abx@version{3.18}
\def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/MW)}
\def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/MW)}
\def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/MW)}
@@ -22,7 +22,7 @@
% This is not updated by build script as the control file version
% does not necessarily change with the package version.
% This is used when writing the .bcf
-\def\blx@bcfversion{3.8}
+\def\blx@bcfversion{3.9}
% This is not updated by build script as the bbl version
% does not necessarily change with the package version.
@@ -150,6 +150,14 @@
\PackageWarning{biblatex}{#1}%
\endgroup}}
+\def\blx@err@patch#1{%
+ \blx@error
+ {Patching #1 failed}
+ {This is an internal issue typically caused by a
+ conflict\MessageBreak between biblatex and some
+ other package. Modifying\MessageBreak the package
+ loading order may fix the problem}}
+
%% Compatibility
% this hook is executed once at the beginning of loading the package
% just a few lines down
@@ -328,6 +336,26 @@
{}}
{}%
\appto\TE@hook{\blx@TE@hook}%
+ % we need to patch \addtocontents
+ \toggletrue{blx@tempa}%
+ % kernel definition
+ \patchcmd\addtocontents
+ {\let\glossary\@gobble}
+ {\let\glossary\@gobble
+ \blx@contentssafe@citecommands}
+ {}
+ {\togglefalse{blx@tempa}}%
+ % try tag.sto's definition
+ \iftoggle{blx@tempa}
+ {}
+ {\patchcmd\addtocontents
+ {\let\glossary\Gobble}
+ {\let\glossary\Gobble
+ \blx@contentssafe@citecommands}
+ {}
+ {% give up
+ \blx@err@patch{\string\addtocontents}}}%
+ % patch footnote
\toggletrue{blx@tempa}%
\def\do#1{%
\patchcmd#1%
@@ -604,10 +632,10 @@
}
-\protected\def\blx@providecounter#1{%
- \ifltxcounter{#1}
+\protected\def\blx@providecount#1{%
+ \ifcscounter{#1}
{}
- {\newcounter{#1}}}
+ {\expandafter\newcount\csname #1\endcsname}}
\def\blx@citecmds{}
% \autocite and \autocites are not defined via \DeclareCiteCommand
@@ -629,13 +657,6 @@
\boolfalse{backtracker}%
\defcounter{refsection}{#1}}
-\patchcmd\addtocontents
- {\let\glossary\@gobble}
- {\let\glossary\@gobble
- \blx@contentssafe@citecommands}
- {}
- {\blx@err@patch{\addtocontents}}
-
% trick hyperref into believing we're natbib
\let\NAT@parse\@empty
% trick showkeys into believing we're havard
@@ -853,11 +874,12 @@
\newcount\blx@tempcntc
\newcounter{blx@maxsection}
\def\theblx@maxsection{\the\c@blx@maxsection}
-\newcounter{blx@maxsegment@0}
+\expandafter\newcount\csname blx@maxsegment@0\endcsname
\newcount\blx@notetype
\newcount\blx@parenlevel@text
\newcount\blx@parenlevel@foot
-\newcounter{blx@sectionciteorder@0}
+\expandafter\newcount\csname blx@sectionciteorder@0\endcsname
+\expandafter\newcount\csname blx@sectionciteorderinternal@0\endcsname
\newcount\blx@entrysetcounter
\newcount\blx@biblioinstance
@@ -919,6 +941,7 @@
\newtoggle{blx@labeltitle}
\newtoggle{blx@labeltitleyear}
\newtoggle{blx@labeldateparts}
+\newtoggle{blx@pluralothers}
\newtoggle{blx@natbib}
\newtoggle{blx@mcite}
\newtoggle{blx@loadfiles}
@@ -1345,13 +1368,6 @@
\protected\def\abx@missing#1{%
\mbox{\reset@font\bfseries#1}}
-\def\blx@err@patch#1{%
- \blx@error
- {Patching #1 failed}
- {This is an internal issue typically caused by a
- conflict\MessageBreak between biblatex and some
- other package. Modifying\MessageBreak the package
- loading order may fix the problem}}
\def\blx@err@nolang#1{%
\blx@error
@@ -2256,13 +2272,14 @@
{\csuse{blx@bbx@#1}}
{\ifcsdef{blx@bbx@*}
{\blx@warning{%
- No driver for entry type '#1'.\MessageBreak
+ No driver for '#1'.\MessageBreak
Using fallback driver}%
\csuse{blx@bbx@*}}
{\blx@error
- {No driver for '\abx@field@entrytype' found}
- {I can't find a driver for the entry type
- '\abx@field@entrytype'\MessageBreak
+ {No driver for '#1' found}
+ {I can't find a driver for
+ '#1'\MessageBreak
+ (entry type '\abx@field@entrytype')\MessageBreak
and there is no fallback driver either}}}}
% {<type>}{<true>}{<false>}
@@ -4580,6 +4597,11 @@
\c@liststop#2\relax
\fi
\fi}%
+ \ifboolexpr{test {\iftoggle{blx@pluralothers}}
+ and
+ test {\ifnumcomp{\value{listtotal}-\value{liststop}}{=}{1}}}
+ {\c@liststop\c@listtotal}
+ {}%
\blx@namecodes}
\def\blx@namesetup@i#1{%
@@ -8421,16 +8443,17 @@
\listcsxadd{blx@keyaliases@\the\c@refsection}{\detokenize{#1}}}
% blx@dlist@list@<section>@<refcontext> - a list of list items in a refcontext in a
-% section (for tracking bibliography lists,
-% obeys skipbiblist)
+% section (for tracking bibliography lists,
+% obeys skipbiblist)
% blx@dlist@entry@<section>@<list> - a list of normal entries in a list in a
-% section (for tracking bibliographies,
-% obeys skipbib)
+% section (for tracking bibliographies,
+% obeys skipbib)
% blx@dlist@centry@<section>@<list> - a list of normal entries in a list in a
-% section (for tracking citations,
-% obeys skipbib). Same as @entry@ but
-% with added set children
-
+% section (for tracking citations,
+% does not obey skipbib).
+% Same as @entry@, but includes skipbib'd entries
+% and set children
+%
% {<entrykey>}{<entrytype>}{<options>}
\protected\def\blx@bbl@entry#1#2#3{%
\begingroup
@@ -8463,9 +8486,11 @@
\ifdef\abx@field@entrysubtype
{\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}}
{}%
+ \nottoggle{blx@setonly}
+ {\listcsxadd{blx@dlist@centry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}}
+ {}%
\nottoggle{blx@skipbib}
- {\listcsxadd{blx@dlist@entry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}%
- \listcsxadd{blx@dlist@centry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}}
+ {\listcsxadd{blx@dlist@entry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}}
{}}%
{}%
\nottoggle{blx@skipbiblist}
@@ -9600,7 +9625,7 @@
\xifinlist{\blx@refcontext@context @\blx@tempe @entry}\blx@dlistnames
{}
{\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @entry}%
- \csxappto{blx@dlists}{%
+ \xappto\blx@dlists{%
\blx@xml@dlist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@refcontext@sortingtemplatename}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix@real}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{}}}%
\ifdefvoid\blx@tempa
{\blx@warn@bibempty\endgroup}
@@ -9651,7 +9676,7 @@
\begingroup
\delimcontext{bib}%
\edef\on@line{\on@line}%
- \ifnum\csname c@blx@maxsegment@\the\c@refsection\endcsname=\z@
+ \ifnum\csname blx@maxsegment@\the\c@refsection\endcsname=\z@
\blx@warning{No reference segments found}%
\fi
\@ifnextchar[%]
@@ -9683,7 +9708,7 @@
{\letcs\blx@tempa{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}}%
\blx@filter\blx@tempa{blx@segm@\the\c@refsection @\the\c@refsegment}%
\blx@bibliography\blx@tempa}%
- \ifnum\c@refsegment<\csname c@blx@maxsegment@\the\c@refsection\endcsname
+ \ifnum\c@refsegment<\csname blx@maxsegment@\the\c@refsection\endcsname
\advance\c@refsegment\@ne
\expandafter\blx@refsegments
\else
@@ -10195,6 +10220,8 @@
\noexpand\blx@kv@setkeys{blx@refcontext}{\csuse{blx@refcontext@name@#2}}}%
\blx@tempa}%
% Override with explicit refcontext keyvals, if given
+ \def\blx@gdef@or@def{\gdef}%
+ \def\blx@xdef@or@edef{\xdef}%
\blx@kv@setkeys{blx@refcontext}{#1}%
% Add the sortingtemplate to the list of sortingtemplates so we can track
% special cases like sorting=none which need cite order change detection
@@ -10241,16 +10268,70 @@
\blx@refcontext@uniquenametemplatename/%
\blx@refcontext@labelalphanametemplatename}}
+% local version of \newrefcontext
+\def\localrefcontext{%
+ \@ifnextchar[%]
+ {\localrefcontext@i}
+ {\localrefcontext@i[]}}
+
+\def\localrefcontext@i[#1]{%
+ \@ifnextchar\bgroup
+ {\localrefcontext@ii[{#1}]}
+ {\localrefcontext@ii[{#1}]{}}}
+
+\newcommand*{\localrefcontext@ii}[2][]{%
+ \ifblank{#2}
+ {}
+ {\begingroup
+ \edef\blx@tempa{\endgroup%
+ \noexpand\blx@kv@setkeys{blx@refcontext}{\csuse{blx@refcontext@name@#2}}}%
+ \blx@tempa}%
+ % Override with explicit refcontext keyvals, if given
+ \def\blx@gdef@or@def{\def}%
+ \def\blx@xdef@or@edef{\edef}%
+ \blx@kv@setkeys{blx@refcontext}{#1}%
+ % Add the sortingtemplate to the list of sortingtemplates so we can track
+ % special cases like sorting=none which need cite order change detection
+ \xifinlist\blx@refcontext@sortingtemplatename\blx@sortingtemplatenames
+ {}
+ {\listxadd\blx@sortingtemplatenames\blx@refcontext@sortingtemplatename}%
+ \blx@edef@refcontext{%
+ \blx@refcontext@sortingtemplatename/%
+ \blx@refcontext@sortingnamekeytemplatename/%
+ \blx@refcontext@labelprefix/%
+ \blx@refcontext@uniquenametemplatename/%
+ \blx@refcontext@labelalphanametemplatename}%
+ % Add the refcontext to the list of refcontexts so we can compare on next run
+ \xifinlist\blx@refcontext@context\blx@refcontexts
+ {}
+ {\listxadd\blx@refcontexts\blx@refcontext@context}%
+ \blx@auxwrite\@mainaux{}{\string\abx@aux@refcontext{\blx@refcontext@context}}%
+ \ifcsundef{blx@sortingtemplate@\blx@refcontext@sortingtemplatename}
+ {\blx@err@invopt{sorting=\blx@refcontext@sortingtemplatename}{}}
+ {}%
+ \ifcsundef{blx@sortingnamekeytemplate@\blx@refcontext@sortingnamekeytemplatename}
+ {\blx@err@invopt{sortingnamekeytemplate=\blx@refcontext@sortingnamekeytemplatename}{}}
+ {}%
+ \ifcsundef{blx@uniquenametemplate@\blx@refcontext@uniquenametemplatename}
+ {\blx@err@invopt{uniquenametemplate=\blx@refcontext@uniquenametemplatename}{}}
+ {}%
+ \ifcsundef{blx@labelalphanametemplate@\blx@refcontext@labelalphanametemplatename}
+ {\blx@err@invopt{labelalphanametemplate=\blx@refcontext@labelalphanametemplatename}{}}
+ {}}
+
+\def\blx@gdef@or@def{\gdef}
+\def\blx@xdef@or@edef{\xdef}
+
% Meta option to set all name template options
\blx@kv@defkey{blx@refcontext}{nametemplates}{%
- \gdef\blx@refcontext@sortingnamekeytemplatename{#1}%
- \gdef\blx@refcontext@uniquenametemplatename{#1}%
- \gdef\blx@refcontext@labelalphanametemplatename{#1}}
+ \blx@gdef@or@def\blx@refcontext@sortingnamekeytemplatename{#1}%
+ \blx@gdef@or@def\blx@refcontext@uniquenametemplatename{#1}%
+ \blx@gdef@or@def\blx@refcontext@labelalphanametemplatename{#1}}
-\blx@kv@defkey{blx@refcontext}{sorting}{\gdef\blx@refcontext@sortingtemplatename{#1}}
-\blx@kv@defkey{blx@refcontext}{sortingnamekeytemplatename}{\gdef\blx@refcontext@sortingnamekeytemplatename{#1}}
-\blx@kv@defkey{blx@refcontext}{uniquenametemplatename}{\gdef\blx@refcontext@uniquenametemplatename{#1}}
-\blx@kv@defkey{blx@refcontext}{labelalphanametemplatename}{\gdef\blx@refcontext@labelalphanametemplatename{#1}}
+\blx@kv@defkey{blx@refcontext}{sorting}{\blx@gdef@or@def\blx@refcontext@sortingtemplatename{#1}}
+\blx@kv@defkey{blx@refcontext}{sortingnamekeytemplatename}{\blx@gdef@or@def\blx@refcontext@sortingnamekeytemplatename{#1}}
+\blx@kv@defkey{blx@refcontext}{uniquenametemplatename}{\blx@gdef@or@def\blx@refcontext@uniquenametemplatename{#1}}
+\blx@kv@defkey{blx@refcontext}{labelalphanametemplatename}{\blx@gdef@or@def\blx@refcontext@labelalphanametemplatename{#1}}
% labelprefix cannot be used as is because it is used to construct the internal
% refcontext name which is referenced/expanded a lot all over the place. So,
@@ -10259,8 +10340,8 @@
% the way and so unexpandable content like \dag breaks.
% Unexpandable content should be protected with \detokenize.
\blx@kv@defkey{blx@refcontext}{labelprefix}{%
- \xdef\blx@refcontext@labelprefix{\blx@mdfivesum{#1}}%
- \gdef\blx@refcontext@labelprefix@real{#1}%
+ \blx@xdef@or@edef\blx@refcontext@labelprefix{\blx@mdfivesum{#1}}%
+ \blx@gdef@or@def\blx@refcontext@labelprefix@real{#1}%
\iftoggle{blx@defernumbers}
{}%
{\iftoggle{blx@labelnumber}
@@ -10269,6 +10350,7 @@
'defernumbers=true'}}
{}}}
+
% [refcontext keys]{<keyword1>,<keyword2>,...}
\newcommand*{\assignrefcontextkeyws}{%
\@ifstar
@@ -10356,7 +10438,49 @@
\blx@kv@defkey{blx@assignrefcontext}{uniquenametemplatename}{\def\blx@tempd{#1}}
\blx@kv@defkey{blx@assignrefcontext}{labelalphanametemplatename}{\def\blx@tempe{#1}}
+% Manually force a refcontext datalist in the .bcf
+\newcommand*{\GenRefcontextData}[1]{%
+ \begingroup
+ \edef\blx@tempb{\the\c@refsection}%
+ \def\blx@tempc{global}%
+ \def\blx@tempd{global}%
+ \def\blx@tempe{global}%
+ \let\blx@tempf\blx@sorting%
+ \let\blx@tempg\@empty%
+ \ifblank{#1}
+ {}
+ {\blx@kv@setkeys{blx@refcontextmanual}{#1}}%
+ \def\blx@tempa{\blx@tempf/\blx@tempc/\blx@tempg/\blx@tempd/\blx@tempe}%
+ \xifinlist{\blx@tempa @\blx@tempb @entry}\blx@dlistnames
+ {}
+ {\listxadd\blx@dlistnames{\blx@tempa @\blx@tempb @entry}%
+ \xappto\blx@dlists{%
+ \blx@xml@dlist{\blx@tempa}{entry}{\blx@tempb}{\blx@xml@dlist@refcontext{\blx@tempf}{\blx@tempc}{\blx@tempg}{\blx@tempd}{\blx@tempe}}{}}}%
+ \endgroup}
+
+% Meta option to set all name template options
+\blx@kv@defkey{blx@refcontextmanual}{nametemplates}{%
+ \def\blx@tempc@sortingnamekeytemplatename{#1}%
+ \def\blx@tempd@uniquenametemplatename{#1}%
+ \def\blx@tempe@labelalphanametemplatename{#1}}
+\blx@kv@defkey{blx@refcontextmanual}{sorting}{\def\blx@tempf{#1}}
+\blx@kv@defkey{blx@refcontextmanual}{sortingnamekeytemplatename}{\def\blx@tempc{#1}}
+\blx@kv@defkey{blx@refcontextmanual}{uniquenametemplatename}{\def\blx@tempd{#1}}
+\blx@kv@defkey{blx@refcontextmanual}{labelalphanametemplatename}{\def\blx@tempe{#1}}
+\blx@kv@defkey{blx@refcontextmanual}{labelprefix}{%
+ \def\blx@tempg{#1}%
+ \iftoggle{blx@defernumbers}
+ {}%
+ {\iftoggle{blx@labelnumber}
+ {\blx@warning{%
+ Option 'labelprefix' requires global\MessageBreak
+ 'defernumbers=true'}}
+ {}}}
+
% Reference sections
+\newrobustcmd*{\AtBeginRefsection}{\gappto\blx@hook@refsectioninit}
+\@onlypreamble\AtBeginRefsection
+
\newrobustcmd*{\newrefsection}{%
\endrefcontext
\ifnum\c@refsection>\z@
@@ -10389,14 +10513,15 @@
\endgroup
\stepcounter{blx@maxsection}%
\setcounter{refsection}{\value{blx@maxsection}}%
+ \csuse{blx@hook@refsectioninit}%
\xifinlist{\the\c@refsection}\blx@allrefsections
{}
{\listxadd\blx@allrefsections{\the\c@refsection}}%
\ifcsdef{blx@defaultrefcontexts@\the\c@refsection}
{}
{\global\cslet{blx@defaultrefcontexts@\the\c@refsection}\@empty}%
- \blx@providecounter{blx@maxsegment@\the\c@refsection}%
- \blx@providecounter{blx@sectionciteorder@\the\c@refsection}%
+ \blx@providecount{blx@maxsegment@\the\c@refsection}%
+ \blx@providecount{blx@sectionciteorder@\the\c@refsection}%
\blx@inf@refsec
\blx@secinit
\if@filesw
@@ -10444,36 +10569,36 @@
\def\blx@endrefsection{%
\blx@endrefsegment
- \blx@providecounter{blx@sectionciteorder@\the\c@refsection}%
+ \blx@providecount{blx@sectionciteorder@\the\c@refsection}%
% make sure we always output aliases to the .bcf otherwise after their
% first resolution by biber, they will be invisible to subsequent biber
% runs since biblatex will resolve the \keyalias{} macro to the main
% entry key, biber won't put \keyalias{}in the .bbl on subsequent runs
% and biblatex will report a missing citekey
- \def\do##1{%
- \blx@xmlsanitizeafter{\def\blx@tempa}{##1}%
- % Make sure this counter exists. Sometimes it might not when using, e.g:
- % refsection=chapter and \includeonly to put in the chapters or when
- % inserting citations into table of contents
- \stepcounter{blx@sectionciteorder@\the\c@refsection}%
- \blx@auxwrite\blx@bcfout{}{%
- \blx@xml@citekey{\blx@tempa}{}
- {\expandafter\the\csname c@blx@sectionciteorder@\the\c@refsection\endcsname}}}%
- \ifcsundef{blx@keyaliases@\the\c@refsection}
+ \ifcsempty{blx@keyaliases@\the\c@refsection}
{}
- {\dolistcsloop{blx@keyaliases@\the\c@refsection}}%
+ {\def\do##1{%
+ \blx@xmlsanitizeafter{\def\blx@tempa}{##1}%
+ % Make sure this counter exists. Sometimes it might not when using, e.g:
+ % refsection=chapter and \includeonly to put in the chapters or when
+ % inserting citations into table of contents
+ \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne
+ \blx@auxwrite\blx@bcfout{}{%
+ \blx@xml@citekey{\blx@tempa}{}
+ {\expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}{1}}}%
+ \dolistcsloop{blx@keyaliases@\the\c@refsection}}%
% output key counts (for \citecount sorting) if citecounter option is not false
\ifcsundef{blx@cites@\the\c@refsection}
{}
{\ifundef\blx@citecounter
{}
{\def\do##1{%
- \ifcsundef{blx@currcount@\the\c@refsection @##1}
- {\csdef{blx@currcount@\the\c@refsection @##1}{0}}
- {}%
- \blx@auxwrite\blx@bcfout{}
- {\blx@xml@citekeycount{##1}{\csuse{blx@currcount@\the\c@refsection @##1}}}}}%
- \dolistcsloop{blx@cites@\the\c@refsection}}%
+ \ifcsundef{blx@currcount@\the\c@refsection @##1}
+ {\csdef{blx@currcount@\the\c@refsection @##1}{0}}
+ {}%
+ \blx@auxwrite\blx@bcfout{}
+ {\blx@xml@citekeycount{##1}{\csuse{blx@currcount@\the\c@refsection @##1}}}}%
+ \dolistcsloop{blx@cites@\the\c@refsection}}}%
\ifnum\c@refsection>\z@
\blx@auxwrite\blx@bcfout{}{%
\blx@xml@endsection\blx@nl
@@ -10512,8 +10637,8 @@
\blx@err@nestenv{refsegment}%
\blx@endrefsegment
\fi
- \stepcounter{blx@maxsegment@\the\c@refsection}%
- \setcounter{refsegment}{\value{blx@maxsegment@\the\c@refsection}}%
+ \global\advance\csname blx@maxsegment@\the\c@refsection\endcsname\@ne
+ \setcounter{refsegment}{\csuse{blx@maxsegment@\the\c@refsection}}%
\blx@inf@refseg
\blx@info{Setting label 'refsegment:\the\c@refsection\the\c@refsegment'}%
\label{refsegment:\the\c@refsection\the\c@refsegment}%
@@ -10993,7 +11118,6 @@
\apptocmd{\blx@hook@entrykey}}
\@onlypreamble\AtEveryEntrykey
-
\def\blx@imc@UseEveryCiteHook{\csuse{blx@hook@cite}}
\def\blx@imc@UseEveryCitekeyHook{\csuse{blx@hook@citekey}}
\def\blx@imc@UseEveryMultiCiteHook{\csuse{blx@hook@mcite}}
@@ -11109,7 +11233,8 @@
\def\blx@citation@all{%
\blx@auxwrite\@mainaux{}{\string\abx@aux@nociteall}%
\ifbool{citerequest}
- {\blx@bibreq{*}%
+ {\global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne
+ \blx@bibreq{*}%
\global\csletcs
{blx@segm@\the\c@refsection @\the\c@refsegment}
{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}%
@@ -11122,6 +11247,7 @@
\listgadd\blx@nocites{*}}
\protected\def\blx@bibreq#1{%
+ \advance\blx@tempcntc\@ne% holds internal \cite{} citation order
\begingroup
\blx@xmlsanitizeafter{\def\blx@tempa}{#1}%
\let\blx@tempb\@empty
@@ -11134,12 +11260,15 @@
not test {\ifinlist{#1}\blx@directcites}}
{\def\blx@tempb{ nocite="1"}}
{}%
+ \blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}%
+ {\expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}%
+ {\expandafter\the\csname blx@tempcntc\endcsname}}%
% citeall is always order "0" - this makes no real difference as biber
% ignores all other citekeys in the section if citeall is present
- \ifstrequal{*}{#1}
- {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{0}}}
- {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{%
- \expandafter\the\csname c@blx@sectionciteorder@\the\c@refsection\endcsname}}}%
+ % \ifstrequal{*}{#1}
+ % {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{0}}}
+ % {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{%
+ % \expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}}}%
\endgroup}
% {<set>}{<key1,key2,key3>}
@@ -11182,8 +11311,16 @@
\endgroup}
% {<entrykey>,...}
+% a crude way to check for a do-nothing argument:
+% loop over it to see what happens
\protected\def\blx@citeloop#1{%
- \expandafter\blx@citeloop@i\expandafter{\detokenize{#1}}}
+ \togglefalse{blx@tempa}%
+ \def\do{\toggletrue{blx@tempa}\listbreak}%
+ \expandafter\docsvlist\expandafter{\detokenize{#1}}%
+ \iftoggle{blx@tempa}
+ {\expandafter\blx@citeloop@i\expandafter{\detokenize{#1}}}
+ {\abx@missing@entry{empty citation}%
+ \@latex@warning{\blx@msg@cundefon{}}}}
\protected\def\blx@citeloop@i#1{%
\begingroup
% This must be here and not after \blx@citeadd as this changes the refcontext
@@ -11194,10 +11331,11 @@
% Make sure this counter exists. Sometimes it might not when using, e.g:
% refsection=chapter and \includeonly to put in the chapters or when
% inserting citations into table of contents
- \blx@providecounter{blx@sectionciteorder@\the\c@refsection}%
- \stepcounter{blx@sectionciteorder@\the\c@refsection}%
+ \blx@providecount{blx@sectionciteorder@\the\c@refsection}%
+ \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne
\blx@tempcnta\z@
\blx@tempcntb\z@
+ \blx@tempcntc\z@
\let\blx@tempa\@empty
\forcsvlist\blx@citeadd{#1}% adds to \blx@tempa
\blx@thenotecheck
@@ -11507,7 +11645,9 @@
\def\blx@ibidtracker@constrict{%
\blx@ifcitesingle
- {\blx@mpfnsave
+ {\iftoggle{blx@footnote}
+ {\blx@mpfnsave}
+ {}%
\blx@ibidtracker@context}
{\blx@ibidreset@context}}%
@@ -11553,7 +11693,9 @@
\let\blx@idemtracker@strict\blx@idemtracker@global
\def\blx@idemtracker@constrict{%
- \blx@mpfnsave
+ \iftoggle{blx@footnote}
+ {\blx@mpfnsave}
+ {}%
\blx@idemtracker@context}
\def\blx@idemreset@force{%
@@ -11602,7 +11744,9 @@
\def\blx@opcittracker@constrict{%
\blx@ifcitesingle
- {\blx@mpfnsave
+ {\iftoggle{blx@footnote}
+ {\blx@mpfnsave}
+ {}%
\blx@opcittracker@context}
{\blx@opcitreset@context}}%
@@ -11913,8 +12057,8 @@
% Make sure this counter exists. Sometimes it might not when using, e.g:
% refsection=chapter and \includeonly to put in the chapters or when
% inserting citations into table of contents
- \blx@providecounter{blx@sectionciteorder@\the\c@refsection}%
- \stepcounter{blx@sectionciteorder@\the\c@refsection}%
+ \blx@providecount{blx@sectionciteorder@\the\c@refsection}%
+ \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne
\blx@nocitation{#1}\blx@msg@cundef}
% {<macro>}[<arg1>][<arg2>]{<arg3>}
@@ -13093,9 +13237,9 @@
\xdef\blx@xml@uniquenametemplatenamepart#1#2#3{%
~~~~<bcf:namepart #1#2>#3</bcf:namepart>\blx@nl}
-\xdef\blx@xml@sortingnamekeytemplate#1#2{%
- ~~<bcf:sortingnamekeytemplate name="#1">\blx@nl%
- #2%
+\xdef\blx@xml@sortingnamekeytemplate#1#2#3{%
+ ~~<bcf:sortingnamekeytemplate name="#1" visibility="#2">\blx@nl%
+ #3%
~~</bcf:sortingnamekeytemplate>\blx@nl}
\xdef\blx@xml@sortingnamekeykeypart#1#2{%
@@ -13166,8 +13310,8 @@
~~</bcf:bibdata>\blx@nl}
\xdef\blx@xml@datasource#1#2#3#4#5{%
~~~~<bcf:datasource type="#1" datatype="#2"#3#4>#5</bcf:datasource>\blx@nl}
-\xdef\blx@xml@citekey#1#2#3{%
- ~~~~<bcf:citekey order="#3"#2>#1</bcf:citekey>}
+\xdef\blx@xml@citekey#1#2#3#4{%
+ ~~~~<bcf:citekey order="#3" intorder="#4"#2>#1</bcf:citekey>}
\xdef\blx@xml@citeset#1#2{%
~~~~<bcf:citekey type="set" members="#2">#1</bcf:citekey>}
\xdef\blx@xml@citekeycount#1#2{%
@@ -13222,6 +13366,7 @@
\blx@xml@toggle{nohashothers}%
\blx@xml@toggle{noroman}%
\blx@xml@toggle{nosortothers}%
+ \blx@xml@toggle{pluralothers}%
\blx@xml@toggle{singletitle}%
\blx@xml@toggle{skipbib}%
\blx@xml@toggle{skipbiblist}%
@@ -13275,8 +13420,8 @@
\blx@xml@toggle{nosortothers}%
\blx@xml@toggle{singletitle}%
\blx@xml@toggle{skipbib}%
- \blx@xml@toggle{skiplab}%
\blx@xml@toggle{skipbiblist}%
+ \blx@xml@toggle{skiplab}%
\blx@xml@svalue{uniquelist}{\blx@uniquelist}%
\blx@xml@svalue{uniquename}{\blx@uniquename}%
\blx@xml@toggle{uniqueprimaryauthor}%
@@ -13476,7 +13621,7 @@
\eappto\blx@tempa{\blx@xml@comment{SORTING NAME KEY TEMPLATES}}%
\def\do##1{%
\eappto\blx@tempa{%
- \blx@xml@sortingnamekeytemplate{##1}{\csuse{blx@sortingnamekeytemplate@##1}}}}%
+ \blx@xml@sortingnamekeytemplate{##1}{\csuse{blx@sortingnamekeytemplatesvisibility@##1}}{\csuse{blx@sortingnamekeytemplate@##1}}}}%
\dolistloop\blx@sortingnamekeytemplates
% presort/sorting excludes/sorting includes
\def\do##1{%
@@ -14159,7 +14304,7 @@
Use '\string\DeclareBiblistFilter' to define it}}
{\def\blx@thebiblistfilter{#1}}}
-% [<langids>][<entrytype>]{translitsource}{translittarget}
+% [<entrytype>]{specification}
\newrobustcmd*{\DeclareSortTranslit}[2][]{%
\begingroup
\ifblank{#1}
@@ -14176,6 +14321,7 @@
\@onlypreamble\DeclareSortTranslit
\blx@DeclareBackendOption{global,type}[xml]{translit}
+% [<langids>]{<field or set>}{translitsource}{translittarget}
\newcommand*{\blx@translit@setup}[4][]{%
\eappto\blx@tempb{%
\ifblank{#1}
@@ -14234,6 +14380,8 @@
\let\namepart\blx@sortnk@namepart
\let\keypart\blx@sortnk@keypart
\let\literal\blx@sortnk@literal
+ \let\visibility\blx@sortnk@visibility
+ \csgdef{blx@sortingnamekeytemplatesvisibility@\blx@snkname}{sort}% default
\let\blx@tempa\@empty
\blx@tempcnta\z@
#2%
@@ -14271,6 +14419,9 @@
\eappto\blx@tempb{%
\blx@xml@sortingnamekeyliteral{\blx@tempe}{#1}}}
+\newcommand*{\blx@sortnk@visibility}[1]{%
+ \csgdef{blx@sortingnamekeytemplatesvisibility@\blx@snkname}{#1}}
+
\newcommand*{\blx@sortnk@namepart}[2][]{%
\advance\blx@tempcntb\@ne
\edef\blx@tempe{ order="\the\blx@tempcntb"}%
@@ -14313,6 +14464,8 @@
\def\citeorder{%
\global\cslet{blx@sortingtemplate@citeorder@relevant@#2}\@empty
\blx@sortdef@field{citeorder}}%
+ \def\intciteorder{%
+ \blx@sortdef@field{intciteorder}}%
\def\citecount{%
\blx@sortdef@field{citecount}}%
\blx@tempcnta\z@
@@ -15561,6 +15714,9 @@
\def\blx@opt@uniquelist@true{true}
\def\blx@opt@uniquelist@minyear{minyear}
+\DeclareBiblatexOption{global}[boolean]{pluralothers}[true]{%
+ \settoggle{blx@pluralothers}{#1}}
+
\blx@DeclareBackendOption{entry,namelist}[string]{uniquelist}
\DeclareBiblatexOption{global,type}[boolean]{nohashothers}[true]{%
@@ -15841,7 +15997,7 @@
% Set defaults
\blx@kv@setkeys{blx@opt@ldt}{style=numeric}
\blx@kv@setkeys{blx@opt@pre}{%
- sorting=nty,sortlocale=auto,sortcase,sortupper,sortcites=false,
+ sorting=nty,sortlocale=auto,sortcase,sortupper,sortcites=false,pluralothers=false,
maxnames=3,minnames=1,maxalphanames=3,minalphanames=1,
maxitems=3,minitems=1,mincrossrefs=2,minxrefs=2,
useauthor=true,useeditor=true,usetranslator=false,
@@ -16071,6 +16227,7 @@
\fi
\blx@bblinput
\setcounter{blx@maxsection}{0}%
+ \csuse{blx@hook@refsectioninit}%
\csuse{abx@preamble}%
\blx@inf@refsec
\blx@inf@refseg}
diff --git a/macros/latex/contrib/biblatex/latex/blx-bibtex.def b/macros/latex/contrib/biblatex/latex/blx-bibtex.def
index 9590e748a5..7e84884ac7 100644
--- a/macros/latex/contrib/biblatex/latex/blx-bibtex.def
+++ b/macros/latex/contrib/biblatex/latex/blx-bibtex.def
@@ -737,6 +737,11 @@
}
\def\blx@ctrlwrite{%
+ \ifcsundef{blx@sorting@\blx@sorting}
+ {\blx@warning@noline{Sorting template '\blx@sorting'\MessageBreak
+ not available with BibTeX backend.\MessageBreak
+ Switch to Biber or select one of the default templates}}
+ {}%
\begingroup
\blx@safe@actives
\let\protect\string
diff --git a/macros/latex/contrib/biblatex/latex/lbx/danish.lbx b/macros/latex/contrib/biblatex/latex/lbx/danish.lbx
index d1dafe601f..7733f4e601 100644
--- a/macros/latex/contrib/biblatex/latex/lbx/danish.lbx
+++ b/macros/latex/contrib/biblatex/latex/lbx/danish.lbx
@@ -75,45 +75,45 @@
\DeclareBibliographyStrings{%
bibliography = {{Bibliografi}{Bibliografi}},
- references = {{Litteraturhenvisninger}{Litteratur}},
+ references = {{Litteratur}{Litteratur}},
shorthands = {{Forkortelser}{Forkortelser}},
- editor = {{redakt\o r}{red\adddot}},
- editors = {{redakt\o rer}{red\adddot}},
+ editor = {{redakt{\o}r}{red\adddot}},
+ editors = {{redakt{\o}rer}{red\adddot}},
compiler = {{kompilator}{kompilator}},
compilers = {{kompilatorer}{kompilatorer}},
- redactor = {{medredakt\o r}{medred\adddot}},
- redactors = {{medredakt\o rer}{medred\adddot}},
- reviser = {{revision}{rev\adddot}},
- revisers = {{revision}{rev\adddot}},
+ redactor = {{medredakt{\o}r}{medred\adddot}},
+ redactors = {{medredakt{\o}rer}{medred\adddot}},
+ reviser = {{korrekturl{\ae}ser}{korrek\adddot}},
+ revisers = {{korrekturl{\ae}sere}{korrek\adddot}},
founder = {{stifter}{stifter}},
founders = {{stiftere}{stiftere}},
- continuator = {{videref\o rer}{videref\adddot}},
- continuators = {{videref\o rere}{videref\adddot}},
- collaborator = {{medarbejder}{medarb\adddot}},
- collaborators = {{medarbejdere}{medarb\adddot}},
- translator = {{overs\ae tter}{overs\adddot}},
- translators = {{overs\ae ttere}{overs\adddot}},
- commentator = {{kommentator}{komm\adddot}},
- commentators = {{kommentatorer}{komm\adddot}},
- annotator = {{kommentator}{komm\adddot}},
- annotators = {{kommentatorer}{komm\adddot}},
- commentary = {{kommentar}{komm\adddot}},
- annotations = {{annoteringer}{ann\adddot}},
+ continuator = {{videref{\o}rer}{videref\adddot}},
+ continuators = {{videref{\o}rere}{videref\adddot}},
+ collaborator = {{samarbejdspartner}{samarb\adddot}},
+ collaborators = {{samarbejdspartnere}{samarb\adddot}},
+ translator = {{overs{\ae}tter}{overs\adddot}},
+ translators = {{overs{\ae}ttere}{overs\adddot}},
+ commentator = {{kommentator}{komment\adddot}},
+ commentators = {{kommentatorer}{komment\adddot}},
+ annotator = {{kommentator}{komment\adddot}},
+ annotators = {{kommentatorer}{komment\adddot}},
+ commentary = {{kommentering}{komment\adddot}},
+ annotations = {{annotering}{annot\adddot}},
introduction = {{indledning}{indl\adddot}},
- foreword = {{forord}{forord}},
- afterword = {{efterord}{efterord}},
- editortr = {{redakt\o r og overs\ae tter}%
+ foreword = {{forord}{forord}},%or prolog
+ afterword = {{epilog}{epilog}},%or efterskrift
+ editortr = {{redakt{\o}r og overs{\ae}tter}%
{red\adddotspace og overs\adddot}},
- editorstr = {{redakt\o rer og overs\ae ttere}%
+ editorstr = {{redakt{\o}rer og overs{\ae}ttere}%
{red\adddotspace og overs\adddot}},
- editorco = {{redakt\o r og kommentator}
- {red\adddotspace og komm\adddot}},
- editorsco = {{redakt\o rer og kommentatorer}
- {red\adddotspace og komm\adddot}},
- editoran = {{redakt\o r og kommentator}%
- {red\adddotspace og komm\adddot}},
- editorsan = {{redakt\o rer og kommentatorer}%
- {red\adddotspace og komm\adddot}},
+ editorco = {{redakt{\o}r og kommentator}
+ {red\adddotspace og komment\adddot}},
+ editorsco = {{redakt{\o}rer og kommentatorer}
+ {red\adddotspace og komment\adddot}},
+ editoran = {{redakt{\o}r og kommentator}%
+ {red\adddotspace og komment\adddot}},
+ editorsan = {{redakt{\o}rer og kommentatorer}%
+ {red\adddotspace og komment\adddot}},
editorin = {{redaktion og indledning}%
{red\adddotspace og indl\adddot}},
editorsin = {{redaktion og indledning}%
@@ -122,122 +122,122 @@
{red\adddotspace og forord}},
editorsfo = {{redaktion og forord}%
{red\adddotspace og forord}},
- editoraf = {{redaktion og efterord}%
- {red\adddotspace og efterord}},
- editorsaf = {{redaktion og efterord}%
- {red\adddotspace og efterord}},
- editortrco = {{redakt\o r, overs\ae tter og kommentator}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editorstrco = {{redakt\o rer, overs\ae ttere og kommentatorer}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editortran = {{redakt\o r, overs\ae tter og kommentator}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editorstran = {{redakt\o rer, overs\ae ttere og kommentatorer}%
- {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
- editortrin = {{redaktion, overs\ae ttelse og indledning}%
- {red.,\addabbrvspace overs\adddotspace og indl\adddot}},
- editorstrin = {{redaktion, overs\ae ttelse og indledning}%
- {red.,\addabbrvspace overs\adddotspace og indl\adddot}},
- editortrfo = {{redaktion, overs\ae ttelse og forord}%
- {red.,\addabbrvspace overs\adddotspace og forord}},
- editorstrfo = {{redaktion, overs\ae ttelse og forord}%
- {red.,\addabbrvspace overs\adddotspace og forord}},
- editortraf = {{redaktion, overs\ae ttelse og efterord}%
- {red.,\addabbrvspace overs\adddotspace og efterord}},
- editorstraf = {{redaktion, overs\ae ttelse og efterord}%
- {red.,\addabbrvspace overs\adddotspace og efterord}},
+ editoraf = {{redaktion og epilog}%
+ {red\adddotspace og epilog}},
+ editorsaf = {{redaktion og epilog}%
+ {red\adddotspace og epilog}},
+ editortrco = {{redakt{\o}r, overs{\ae}tter og kommentator}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editorstrco = {{redakt{\o}rer, overs{\ae}ttere og kommentatorer}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editortran = {{redakt{\o}r, overs{\ae}tter og kommentator}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editorstran = {{redakt{\o}rer, overs{\ae}ttere og kommentatorer}%
+ {red\adddot,\addabbrvspace overs\adddotspace og komment\adddot}},
+ editortrin = {{redaktion, overs{\ae}ttelse og indledning}%
+ {red\adddot,\addabbrvspace overs\adddotspace og indl\adddot}},
+ editorstrin = {{redaktion, overs{\ae}ttelse og indledning}%
+ {red\addot,\addabbrvspace overs\adddotspace og indl\adddot}},
+ editortrfo = {{redaktion, overs{\ae}ttelse og forord}%
+ {red\adddot,\addabbrvspace overs\adddotspace og forord}},
+ editorstrfo = {{redaktion, overs{\ae}ttelse og forord}%
+ {red\adddot,\addabbrvspace overs\adddotspace og forord}},
+ editortraf = {{redaktion, overs{\ae}ttelse og epilog}%
+ {red\adddot,\addabbrvspace overs\adddotspace og epilog}},
+ editorstraf = {{redaktion, overs{\ae}ttelse og epilog}%
+ {red\adddot,\addabbrvspace overs\adddotspace og epilog}},
editorcoin = {{redaktion, kommentarer og indledning}%
- {red.,\addabbrvspace komm\adddotspace og indl\adddot}},
+ {red\adddot,\addabbrvspace komment\adddotspace og indl\adddot}},
editorscoin = {{redaktion, kommentarer og indledning}%
- {red.,\addabbrvspace komm\adddotspace og indl\adddot}},
+ {red\adddot,\addabbrvspace komment\adddotspace og indl\adddot}},
editorcofo = {{redaktion, kommentarer og forord}%
- {red.,\addabbrvspace komm\adddotspace og forord}},
+ {red\adddot,\addabbrvspace komment\adddotspace og forord}},
editorscofo = {{redaktion, kommentarer og forord}%
- {red.,\addabbrvspace komm\adddotspace og forord}},
- editorcoaf = {{redaktion, kommentarer og efterord}%
- {red.,\addabbrvspace komm\adddotspace og efterord}},
- editorscoaf = {{redaktion, kommentarer og efterord}%
- {red.,\addabbrvspace komm\adddotspace og efterord}},
- editoranin = {{redaktion, annoteringer og indledning}%
- {red.,\addabbrvspace ann\adddotspace og indl\adddot}},
- editorsanin = {{redaktion, \adddotspace og indledning}%
- {red.,\addabbrvspace ann\adddotspace og indl\adddot}},
- editoranfo = {{redaktion, \adddotspace og forord}%
- {red.,\addabbrvspace ann\adddotspace og forord}},
- editorsanfo = {{redaktion, annoteringer og forord}%
- {red.,\addabbrvspace ann\adddotspace og forord}},
- editoranaf = {{redaktion, annoteringer og efterord}%
- {red.,\addabbrvspace ann\adddotspace og efterord}},
- editorsanaf = {{redaktion, annoteringer og efterord}%
- {red.,\addabbrvspace ann\adddotspace og efterord}},
- editortrcoin = {{redaktion, overs\ae ttelse, kommentarer og indledning}%
- {red.,\addabbrvspace overs., komm\adddotspace og indl\adddot}},
- editorstrcoin = {{redaktion, overs\ae ttelse, kommentarer og indledning}%
- {red.,\addabbrvspace overs., komm\adddotspace og indl\adddot}},
- editortrcofo = {{redaktion, overs\ae ttelse, kommentarer og forord}%
- {red.,\addabbrvspace overs., komm\adddotspace og forord}},
- editorstrcofo = {{redaktion, overs\ae ttelse, kommentarer og forord}%
- {red.,\addabbrvspace overs., komm\adddotspace og forord}},
- editortrcoaf = {{redaktion, overs\ae ttelse, kommentarer og efterord}%
- {red.,\addabbrvspace overs., komm\adddotspace og efterord}},
- editorstrcoaf = {{redaktion, overs\ae ttelse, kommentarer og efterord}%
- {red.,\addabbrvspace overs., komm\adddotspace og efterord}},
- editortranin = {{redaktion, overs\ae ttelse, annoteringer og indledning}%
- {red.,\addabbrvspace overs., ann\adddotspace og indl\adddot}},
- editorstranin = {{redaktion, overs\ae ttelse, annoteringer og indledning}%
- {red.,\addabbrvspace overs., ann\adddotspace og indl\adddot}},
- editortranfo = {{redaktion, overs\ae ttelse, annoteringer og forord}%
- {red.,\addabbrvspace overs., ann\adddotspace og forord}},
- editorstranfo = {{redaktion, overs\ae ttelse, annoteringer og forord}%
- {red.,\addabbrvspace overs., ann\adddotspace og forord}},
- editortranaf = {{redaktion, overs\ae ttelse, annoteringer og efterord}%
- {red.,\addabbrvspace overs., ann\adddotspace og efterord}},
- editorstranaf = {{redaktion, overs\ae ttelse, annoteringer og efterord}%
- {red.,\addabbrvspace overs., ann\adddotspace og efterord}},
- translatorco = {{overs\ae ttelse og kommentarer}%
- {overs\adddotspace og komm\adddot}},
- translatorsco = {{overs\ae ttelse og kommentarer}%
- {overs\adddotspace og komm\adddot}},
- translatoran = {{overs\ae ttelse og annoteringer}%
- {overs\adddotspace og ann\adddot}},
- translatorsan = {{overs\ae ttelse og annoteringer}%
- {overs\adddotspace og ann\adddot}},
- translatorin = {{overs\ae ttelse og indledning}%
+ {red\adddot,\addabbrvspace komment\adddotspace og forord}},
+ editorcoaf = {{redaktion, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace komment\adddotspace og epilog}},
+ editorscoaf = {{redaktion, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace komment\adddotspace og epilog}},
+ editoranin = {{redaktion, annotering og indledning}%
+ {red\adddot,\addabbrvspace annot\adddotspace og indl\adddot}},
+ editorsanin = {{redaktion, annotering og indledning}%
+ {red\adddot,\addabbrvspace annot\adddotspace og indl\adddot}},
+ editoranfo = {{redaktion, annotering og forord}%
+ {red\adddot,\addabbrvspace annot\adddotspace og forord}},
+ editorsanfo = {{redaktion, annotering og forord}%
+ {red\adddot,\addabbrvspace annot\adddotspace og forord}},
+ editoranaf = {{redaktion, annotering og epilog}%
+ {red\adddot,\addabbrvspace annot\adddotspace og epilog}},
+ editorsanaf = {{redaktion, annotering og epilog}%
+ {red\adddot,\addabbrvspace annot\adddotspace og epilog}},
+ editortrcoin = {{redaktion, overs{\ae}ttelse, kommentarer og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og indl\adddot}},
+ editorstrcoin = {{redaktion, overs{\ae}ttelse, kommentarer og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og indl\adddot}},
+ editortrcofo = {{redaktion, overs{\ae}ttelse, kommentarer og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og forord}},
+ editorstrcofo = {{redaktion, overs{\ae}ttelse, kommentarer og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og forord}},
+ editortrcoaf = {{redaktion, overs{\ae}ttelse, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og epilog}},
+ editorstrcoaf = {{redaktion, overs{\ae}ttelse, kommentarer og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, komment\adddotspace og epilog}},
+ editortranin = {{redaktion, overs{\ae}ttelse, annotering og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og indl\adddot}},
+ editorstranin = {{redaktion, overs{\ae}ttelse, annotering og indledning}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og indl\adddot}},
+ editortranfo = {{redaktion, overs{\ae}ttelse, annotering og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og forord}},
+ editorstranfo = {{redaktion, overs{\ae}ttelse, annotering og forord}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og forord}},
+ editortranaf = {{redaktion, overs{\ae}ttelse, annotering og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og epilog}},
+ editorstranaf = {{redaktion, overs{\ae}ttelse, annotering og epilog}%
+ {red\adddot,\addabbrvspace overs\adddot, annot\adddotspace og epilog}},
+ translatorco = {{overs{\ae}ttelse og kommentarer}%
+ {overs\adddotspace og komment\adddot}},
+ translatorsco = {{overs{\ae}ttelse og kommentarer}%
+ {overs\adddotspace og komment\adddot}},
+ translatoran = {{overs{\ae}ttelse og annotering}%
+ {overs\adddotspace og annot\adddot}},
+ translatorsan = {{overs{\ae}ttelse og annotering}%
+ {overs\adddotspace og annot\adddot}},
+ translatorin = {{overs{\ae}ttelse og indledning}%
{overs\adddotspace og indl\adddot}},
- translatorsin = {{overs\ae ttelse og indledning}%
+ translatorsin = {{overs{\ae}ttelse og indledning}%
{overs\adddotspace og indl\adddot}},
- translatorfo = {{overs\ae ttelse og forord}%
+ translatorfo = {{overs{\ae}ttelse og forord}%
{overs\adddotspace og forord}},
- translatorsfo = {{overs\ae ttelse og forord}%
+ translatorsfo = {{overs{\ae}ttelse og forord}%
{overs\adddotspace og forord}},
- translatoraf = {{overs\ae ttelse og efterord}%
- {overs\adddotspace og efterord}},
- translatorsaf = {{overs\ae ttelse og efterord}%
- {overs\adddotspace og efterord}},
- translatorcoin = {{overs\ae ttelse, kommentarer og indledning}%
- {overs., komm\adddotspace og indl\adddot}},
- translatorscoin = {{overs\ae ttelse, kommentarer og indledning}%
- {overs., komm\adddotspace og indl\adddot}},
- translatorcofo = {{overs\ae ttelse, kommentarer og forord}%
- {overs., komm\adddotspace og forord}},
- translatorscofo = {{overs\ae ttelse, kommentarer og forord}%
- {overs., komm\adddotspace og forord}},
- translatorcoaf = {{overs\ae ttelse, kommentarer og efterord}%
- {overs., komm\adddotspace og efterord}},
- translatorscoaf = {{overs\ae ttelse, kommentarer og efterord}%
- {overs., komm\adddotspace og efterord}},
- translatoranin = {{overs\ae ttelse, annoteringer og indledning}%
- {overs., ann\adddotspace og indl\adddot}},
- translatorsanin = {{overs\ae ttelse, annoteringer og indledning}%
- {overs., ann\adddotspace og indl\adddot}},
- translatoranfo = {{overs\ae ttelse, annoteringer og forord}%
- {overs., ann\adddotspace og forord}},
- translatorsanfo = {{overs\ae ttelse, annoteringer og forord}%
- {overs., ann\adddotspace og forord}},
- translatoranaf = {{overs\ae ttelse, annoteringer og efterord}%
- {overs., ann\adddotspace og efterord}},
- translatorsanaf = {{overs\ae ttelse, annoteringer og efterord}%
- {overs., ann\adddotspace og efterord}},
+ translatoraf = {{overs{\ae}ttelse og epilog}%
+ {overs\adddotspace og epilog}},
+ translatorsaf = {{overs{\ae}ttelse og epilog}%
+ {overs\adddotspace og epilog}},
+ translatorcoin = {{overs{\ae}ttelse, kommentarer og indledning}%
+ {overs\adddot, komment\adddotspace og indl\adddot}},
+ translatorscoin = {{overs{\ae}ttelse, kommentarer og indledning}%
+ {overs\adddot, komment\adddotspace og indl\adddot}},
+ translatorcofo = {{overs{\ae}ttelse, kommentarer og forord}%
+ {overs\adddot, komment\adddotspace og forord}},
+ translatorscofo = {{overs{\ae}ttelse, kommentarer og forord}%
+ {overs\adddot, komment\adddotspace og forord}},
+ translatorcoaf = {{overs{\ae}ttelse, kommentarer og epilog}%
+ {overs\adddot, komment\adddotspace og epilog}},
+ translatorscoaf = {{overs{\ae}ttelse, kommentarer og epilog}%
+ {overs\adddot, komment\adddotspace og epilog}},
+ translatoranin = {{overs{\ae}ttelse, annotering og indledning}%
+ {overs\adddot, annot\adddotspace og indl\adddot}},
+ translatorsanin = {{overs{\ae}ttelse, annotering og indledning}%
+ {overs\adddot, annot\adddotspace og indl\adddot}},
+ translatoranfo = {{overs{\ae}ttelse, annotering og forord}%
+ {overs\adddot, annot\adddotspace og forord}},
+ translatorsanfo = {{overs{\ae}ttelse, annotering og forord}%
+ {overs\adddot, annot\adddotspace og forord}},
+ translatoranaf = {{overs{\ae}ttelse, annotering og epilog}%
+ {overs\adddot, annot\adddotspace og epilog}},
+ translatorsanaf = {{overs{\ae}ttelse, annotering og epilog}%
+ {overs\adddot, annot\adddotspace og epilog}},
organizer = {{organisator}{org\adddot}},
organizers = {{organisatorer}{org\adddot}},
byorganizer = {{organiseret af}{org\adddotspace av}},
@@ -252,118 +252,118 @@
bycollaborator = {{i samarbejde med}{i samarb\adddotspace m\adddot}},
bytranslator = {{oversat \lbx@lfromlang\ af}%
{overs\adddot\ \lbx@sfromlang\ af}},
- bycommentator = {{kommenteret af}{komm\adddot\ af}},
- byannotator = {{annoteret af}{ann\adddot\ af}},
- withcommentator = {{med kommentarer af}{m\adddotspace komm\adddot\ af}},
- withannotator = {{med annoteringer af}{m\adddotspace ann\adddot\ af}},
+ bycommentator = {{kommenteret af}{komment\adddot\ af}},
+ byannotator = {{annoteret af}{annot\adddot\ af}},
+ withcommentator = {{med kommentarer af}{m\adddotspace komment\adddot\ af}},
+ withannotator = {{med annotering af}{m\adddotspace annot\adddot\ af}},
withintroduction = {{med indledning af}{m\adddotspace indl\adddot\ af}},
withforeword = {{med forord af}{m\adddotspace forord af}},
- withafterword = {{med efterord af}{m\adddotspace efterord af}},
+ withafterword = {{med epilog af}{m\adddotspace epilog af}},
byeditortr = {{redigeret og oversat \lbx@lfromlang\ af}%
{red\adddotspace og overs\adddot\ \lbx@sfromlang\ af}},
byeditorco = {{redigeret og kommenteret af}%
- {red\adddotspace og komm\adddot\ af}},
- byeditoran = {{redigeret med annoteringer af}%
- {red\adddotspace m\adddotspace ann\adddotspace af}},
+ {red\adddotspace og komment\adddot\ af}},
+ byeditoran = {{redigeret med annotering af}%
+ {red\adddotspace m\adddotspace annot\adddotspace af}},
byeditorin = {{redigeret med indledning af}%
{red\adddotspace med indl\adddot\ af}},
byeditorfo = {{redigeret med forord af}%
{red\adddotspace med forord af}},
- byeditoraf = {{redigeret med efterord af}%
- {red\adddotspace med efterord af}},
+ byeditoraf = {{redigeret med epilog af}%
+ {red\adddotspace med epilog af}},
byeditortrco = {{redigeret, oversat \lbx@lfromlang\ og kommenteret af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komment\adddot\ af}},
byeditortran = {{redigeret, oversat \lbx@lfromlang\ og annoteret af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og ann\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og annot\adddot\ af}},
byeditortrin = {{redigeret, oversat \lbx@lfromlang\ og med indledning af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og indl\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og indl\adddot\ af}},
byeditortrfo = {{redigeret, oversat \lbx@lfromlang\ og med forord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forord af}},
- byeditortraf = {{redigeret, oversat \lbx@lfromlang\ og med efterord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og efterord af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forord af}},
+ byeditortraf = {{redigeret, oversat \lbx@lfromlang\ og med epilog af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og epilog af}},
byeditorcoin = {{redigeret, kommenteret og med indledning af}%
- {red.,\addabbrvspace komm\adddot\ og indl\adddotspace af}},
+ {red\adddot,\addabbrvspace komment\adddot\ og indl\adddotspace af}},
byeditorcofo = {{redigeret, kommenteret og med forord af}%
- {red.,\addabbrvspace komm\adddot\ og forord af}},
- byeditorcoaf = {{redigeret, kommenteret og med efterord af}%
- {red.,\addabbrvspace komm\adddot\ og efterord af}},
+ {red\adddot,\addabbrvspace komment\adddot\ og forord af}},
+ byeditorcoaf = {{redigeret, kommenteret og med epilog af}%
+ {red\adddot,\addabbrvspace komment\adddot\ og epilog af}},
byeditoranin = {{redigeret, annoteret og med indledning af}%
- {red.,\addabbrvspace ann\adddot\ og indl\adddot\ af}},
+ {red\adddot,\addabbrvspace annot\adddot\ og indl\adddot\ af}},
byeditoranfo = {{redigeret, annoteret og med forord af}%
- {red.,\addabbrvspace ann\adddot\ og forord af}},
- byeditoranaf = {{redigeret, annoteret og med efterord af}%
- {red.,\addabbrvspace ann\adddot\ og efterord af}},
+ {red\adddot,\addabbrvspace annot\adddot\ og forord af}},
+ byeditoranaf = {{redigeret, annoteret og med epilog af}%
+ {red\adddot,\addabbrvspace annot\adddot\ og epilog af}},
byeditortrcoin = {{redigeret, oversat \lbx@lfromlang, kommenteret og med indledning af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang, komm\adddot\ og indl\adddot\ af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang, komment\adddot\ og indl\adddot\ af}},
byeditortrcofo = {{redigeret, oversat \lbx@lfromlang, kommenteret og med forord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang, komm\adddot\ og forord af}},
- byeditortrcoaf = {{redigeret, oversat \lbx@lfromlang, kommenteret og med efterord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang, komm\adddot\ og efterord af}},
- byeditortranin = {{redigeret, oversat \lbx@lfromlang, med annoteringer og indledning af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang, ann\adddot\ og indl\adddot\ af}},
- byeditortranfo = {{redigeret, oversat \lbx@lfromlang, med annoteringer og forord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang, ann\adddot\ og forord af}},
- byeditortranaf = {{redigeret, oversat \lbx@lfromlang, med annoteringer og efterord af}%
- {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang, ann\adddot\ og efterord af}},
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang, komment\adddot\ og forord af}},
+ byeditortrcoaf = {{redigeret, oversat \lbx@lfromlang, kommenteret og med epilog af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang, komment\adddot\ og epilog af}},
+ byeditortranin = {{redigeret, oversat \lbx@lfromlang, med annotering og indledning af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang, annot\adddot\ og indl\adddot\ af}},
+ byeditortranfo = {{redigeret, oversat \lbx@lfromlang, med annotering og forord af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang, annot\adddot\ og forord af}},
+ byeditortranaf = {{redigeret, oversat \lbx@lfromlang, med annotering og epilog af}%
+ {red\adddot,\addabbrvspace overs\adddot\ \lbx@sfromlang, annot\adddot\ og epilog af}},
bytranslatorco = {{oversat \lbx@lfromlang\ med kommentarer af}%
- {overs\adddot\ \lbx@sfromlang\ m\adddotspace komm\adddot\ af}},
+ {overs\adddot\ \lbx@sfromlang\ m\adddotspace komment\adddot\ af}},
bytranslatoran = {{oversat \lbx@lfromlang\ og annoteret af}%
- {overs\adddot\ \lbx@sfromlang\ og ann\adddot\ af}},
+ {overs\adddot\ \lbx@sfromlang\ og annot\adddot\ af}},
bytranslatorin = {{oversat \lbx@lfromlang\ med indledning af}%
{overs\adddot\ \lbx@sfromlang\ m\adddotspace indl\adddot\ af}},
bytranslatorfo = {{oversat \lbx@lfromlang\ med forord af}%
{overs\adddot\ \lbx@sfromlang\ m\adddotspace forord af}},
- bytranslatoraf = {{oversat \lbx@lfromlang\ med efterord af}%
- {overs\adddot\ \lbx@sfromlang\ m\adddotspace efterord af}},
+ bytranslatoraf = {{oversat \lbx@lfromlang\ med epilog af}%
+ {overs\adddot\ \lbx@sfromlang\ m\adddotspace epilog af}},
bytranslatorcoin = {{oversat \lbx@lfromlang\addspace med kommentarer og indledning af}%
- {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komm\adddotspace og indl\adddotspace af}},
+ {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komment\adddotspace og indl\adddotspace af}},
bytranslatorcofo = {{oversat \lbx@lfromlang\addspace med kommentarer og forord af}%
- {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komm\adddot\ og forord af}},
- bytranslatorcoaf = {{oversat \lbx@lfromlang\addspace med kommentarer og efterord af}%
- {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komm\adddot\ og efterord af}},
- bytranslatoranin = {{oversat \lbx@lfromlang\addspace med annoteringer og indledning af}%
- {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace ann\adddot\ og indl\adddot\ af}},
- bytranslatoranfo = {{oversat \lbx@lfromlang\addspace med annoteringer og forord af}%
- {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace ann\adddot\ og forord af}},
- bytranslatoranaf = {{oversat \lbx@lfromlang\addspace med annoteringer og efterord af}%
- {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace ann\adddot\ og efterord af}},
+ {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komment\adddot\ og forord af}},
+ bytranslatorcoaf = {{oversat \lbx@lfromlang\addspace med kommentarer og epilog af}%
+ {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komment\adddot\ og epilog af}},
+ bytranslatoranin = {{oversat \lbx@lfromlang\addspace med annotering og indledning af}%
+ {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace annot\adddot\ og indl\adddot\ af}},
+ bytranslatoranfo = {{oversat \lbx@lfromlang\addspace med annotering og forord af}%
+ {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace annot\adddot\ og forord af}},
+ bytranslatoranaf = {{oversat \lbx@lfromlang\addspace med annotering og epilog af}%
+ {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace annot\adddot\ og epilog af}},
and = {{og}{og}},
- andothers = {{med flere}{m.fl\adddot}},
- andmore = {{med mere}{m.m\adddot}},
+ andothers = {{med flere}{m\adddot fl\adddot}},
+ andmore = {{med mere}{m\adddot m\adddot}},
volume = {{bind}{bd\adddot}},
volumes = {{bind}{bd\adddot}},
involumes = {{i}{i}},
- jourvol = {{\aa rgang}{\aa rg\adddot}},
- jourser = {{r\ae kke}{rk\adddot}},
+ jourvol = {{{\aa}rgang}{{\aa}rg\adddot}},
+ jourser = {{r{\ae}kke}{rk\adddot}},
book = {{bog}{bog}},
part = {{del}{del}},
issue = {{nummer}{nr\adddot}},
- newseries = {{ny r\ae kke}{ny rk\adddot}},
- oldseries = {{gammel r\ae kke}{gl. rk\adddot}},
+ newseries = {{ny r{\ae}kke}{ny rk\adddot}},
+ oldseries = {{gammel r{\ae}kke}{gl. rk\adddot}},
edition = {{udgave}{udg\adddot}},
reprint = {{genoptryk}{genoptr\adddot}},
reprintof = {{genoptryk af}{genoptr\adddot\ af}},
- reprintas = {{genoptryk under titlen}{genoptr\adddot\ under titlen}},
- reprintfrom = {{genoptryk fra}{genoptr\adddot\ fra}},
- translationof = {{overs\ae ttelse af}{overs\adddot\ af}},
- translationas = {{oversat under titlen}{overs\adddotspace\ under titlen}},
- translationfrom = {{oversat fra}{overs\adddotspace\ fra}},
+ reprintas = {{genoptryk under titlen}{genoptr\adddotspace under titlen}},
+ reprintfrom = {{genoptryk fra}{genoptr\adddotspace fra}},
+ translationof = {{overs{\ae}ttelse af}{overs\adddot\ af}},
+ translationas = {{oversat under titlen}{overs\adddotspace under titlen}},
+ translationfrom = {{oversat fra}{overs\adddotspace fra}},
reviewof = {{bed\o mmelse af}{bed\adddotspace af}},
origpubas = {{oprindeligt udgivet som}{opr\adddot\ udg\adddot\ som}},
origpubin = {{oprindeligt udgivet i}{opr\adddot\ udg\adddot\ i}},
astitle = {{under titlen}{under titlen}},
bypublisher = {{af}{af}},
- nodate = {{uden \aa rstal}{u.\aa\adddot}},
+ nodate = {{uden dato}{u\adddot d\adddot}},%CORRECT: uden dato, NOT: uden år.
page = {{side}{s\adddot}},
- pages = {{sider}{s\adddot}},
+ pages = {{side}{s\adddot}},%not pluralized in Danish. In the context: side 1–16. NOT: sider 1–16.
column = {{spalte}{sp\adddot}},
- columns = {{spalter}{sp\adddot}},
+ columns = {{spalte}{sp\adddot}},
line = {{linje}{l\adddot}},
- lines = {{linjer}{l\adddot}},
+ lines = {{linje}{l\adddot}},
verse = {{vers}{v\adddot}},
verses = {{vers}{v\adddot}},
section = {{paragraf}{par\adddot}},
- sections = {{paragraffer}{par\adddot}},
+ sections = {{paragraf}{par\adddot}},
paragraph = {{afsnit}{afsn\adddot}},
paragraphs = {{afsnit}{afsn\adddot}},
pagetotal = {{side}{s\adddot}},
@@ -371,44 +371,44 @@
columntotal = {{spalte}{sp\adddot}},
columntotals = {{spalter}{sp\adddot}},
line = {{linje}{l\adddot}},
- lines = {{linjer}{l\adddot}},
+ lines = {{linje}{l\adddot}},
verse = {{vers}{v\adddot}},
verses = {{vers}{v\adddot}},
linetotal = {{linje}{l\adddot}},
- linetotals = {{linje}{l\adddot}},
+ linetotals = {{linjer}{l\adddot}},
versetotal = {{vers}{v\adddot}},
versetotals = {{vers}{v\adddot}},
- sectiontotal = {{paragraf}{par\adddot}},
- sectiontotals = {{paragraffer}{par\adddot}},
+ sectiontotal = {{sektion}{sekt\adddot}},
+ sectiontotals = {{sektioner}{sekt\adddot}},
paragraphtotal = {{afsnit}{afsn\adddot}},
paragraphtotals = {{afsnit}{afsn\adddot}},%
in = {{i}{i}},
- inseries = {{i r\ae kken}{i rk\adddot}},
- ofseries = {{fra r\ae kken}{fra rk\adddot}},
+ inseries = {{i r{\ae}kken}{i rk\adddot}},
+ ofseries = {{fra r{\ae}kken}{fra rk\adddot}},
number = {{nummer}{nr\adddot}},
-% numbers = {{numre}{nr\adddot}},
+ % numbers = {{numre}{nr\adddot}},%It is unclear where it comes from and what it is for. undefined variable and thus gives an xkeyval error.
chapter = {{kapitel}{kap\adddot}},
- bathesis = {{bachelorafhandling}{bachelorafh\adddot}},
- mathesis = {{masterafhandling}{masterafh\adddot}},
- phdthesis = {{PhD afhandling}{PhD afh\adddot}},
- candthesis = {{specialeafhandling}{specialeafh\adddot}},
+ bathesis = {{Bachelorafhandling}{Bachelorafh\adddot}},
+ mathesis = {{Masterafhandling}{Masterafh\adddot}},
+ phdthesis = {{PhD-afhandling}{PhD-afh\adddot}},
+ candthesis = {{Kandidatspeciale}{Kand\adddotspace spec\adddot}},
resreport = {{forskningsrapport}{forskningsrap\adddot}},
- techreport = {{teknisk rapport}{tekn\adddot\ rap\adddot}},
+ techreport = {{teknisk rapport}{tekn.\adddot\ rapp\adddot}},
software = {{software}{software}},
datacd = {{data-cd}{data-cd}},
audiocd = {{lyd-cd}{lyd-cd}},
version = {{version}{vers\adddot}},
url = {{webadresse}{webadr\adddot}},
- urlfrom = {{tilg\ae ngelig fra}{tilg\adddotspace fra}},
- urlseen = {{bes\o gt}{bes\adddot}},
+ urlfrom = {{tilg{\ae}ngelig fra}{tilg\adddotspace fra}},
+ urlseen = {{hentet}{hentet}},%retrieved date
inpreparation = {{under udarbejdelse}{under udarb\adddot}},
submitted = {{indleveret}{indlev\adddot}},
forthcoming = {{under udgivelse}{under udgiv\adddot}},
inpress = {{i trykken}{i trykken}},
- prepublished = {{pr\ae publiceret}{pr\ae publ\adddot}},
+ prepublished = {{pr{\ae}publiceret}{pr{\ae}publ\adddot}},
citedas = {{herefter citeret som}{herefter cit\adddot\ som}},
thiscite = {{her}{her}},
- seenote = {{se note}{se nt\adddot}},
+ seenote = {{se note}{se note}},
quotedin = {{citeret efter}{cit\adddot\ efter}},
idem = {{den samme}{d\adddot s\adddot}},
idemsf = {{den samme}{d\adddot s\adddot}},
@@ -419,14 +419,14 @@
idempn = {{de samme}{d\adddot s\adddot}},
idempp = {{de samme}{d\adddot s\adddot}},
ibidem = {{ibidem}{ibid\adddot}},
- opcit = {{op.\adddotspace cit\adddot}{op.\adddotspace cit\adddot}},
- loccit = {{loc.\adddotspace cit\adddot}{loc.\adddotspace cit\adddot}},
- confer = {{j\ae vnf\o r}{jvf\adddot}},
+ opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+ confer = {{j{\ae}vnf{\o}r}{jf\adddot}},
sequens = {{f\adddot}{f\adddot}},
sequentes = {{ff\adddot}{ff\adddot}},
passim = {{passim}{pass\adddot}},
see = {{se}{s\adddot}},
- seealso = {{se ogs\aa}{se ogs\aa}},
+ seealso = {{se ogs{\aa}}{se ogs{\aa}}},
backrefpage = {{se side}{se s\adddot}},
backrefpages = {{se siderne}{se s\adddot}},
january = {{januar}{jan\adddot}},
@@ -455,7 +455,7 @@
langfrench = {{fransk}{fransk}},
langgalician = {{galicisk}{galicisk}},
langgerman = {{tysk}{tysk}},
- langgreek = {{gr\ae sk}{gr\ae sk}},
+ langgreek = {{gr{\ae}sk}{gr{\ae}sk}},
langhungarian = {{ungarsk}{ungarsk}},
langitalian = {{italiensk}{italiensk}},
langjapanese = {{japansk}{japansk}},
@@ -484,7 +484,7 @@
fromfrench = {{fra fransk}{fra fransk}},
fromgalician = {{fra galicisk}{fra galicisk}},
fromgerman = {{fra tysk}{fra tysk}},
- fromgreek = {{fra gr\ae sk}{fra gr\ae sk}},
+ fromgreek = {{fra gr{\ae}sk}{fra gr{\ae}sk}},
fromhungarian = {{fra ungarsk}{fra ungarsk}},
fromitalian = {{fra italiensk}{fra italiensk}},
fromjapanese = {{fra japansk}{fra japansk}},
@@ -500,55 +500,55 @@
fromswedish = {{fra svensk}{fra svensk}},
fromukrainian = {{fra ukrainsk}{fra ukrainsk}},
countryde = {{Tyskland}{DE}},
- countryeu = {{Europ\ae iske Union}{EU}},
- countryep = {{Europ\ae iske Union}{EP}},
+ countryeu = {{Europ{\ae}iske Union}{EU}},
+ countryep = {{Europ{\ae}iske Union}{EP}},%must be wrong. Does this refer to European Parliament or European Patent?
countryfr = {{Frankrig}{FR}},
countryuk = {{Storbritannien}{GB}},
countryus = {{USA}{US}},
patent = {{patent}{pat\adddot}},
- patentde = {{tysk patent}{tysk pat\adddot}},
- patenteu = {{europ\ae isk patent}{eur\adddot\ pat\adddot}},
- patentfr = {{fransk patent}{fransk pat\adddot}},
- patentuk = {{britisk patent}{brit\adddot\ pat\adddot}},
- patentus = {{amerikansk patent}{am\adddot\ pat\adddot}},
- patreq = {{patentans\o gning}{pat\adddot\ ans\o gn\adddot}},
- patreqde = {{tysk patentans\o gning}{tysk pat\adddot\ ans\o gn\adddot}},
- patreqeu = {{europ\ae isk patentans\o gning}{eur\adddot\ pat\adddot\ ans\o gn\adddot}},
- patreqfr = {{fransk patentans\o gning}{fransk pat\adddot\ ans\o gn\adddot}},
- patrequk = {{britisk patentans\o gning}{brit\adddot\ pat\adddot\ ans\o gn\adddot}},
- patrequs = {{amerikansk patentans\o gning}{am\adddot\ pat\adddot\ ans\o gn\adddot}},
+ patentde = {{DE-patent}{DE-pat\adddot}},
+ patenteu = {{EU-patent}{EU-pat\adddot}},
+ patentfr = {{FR-patent}{FR-pat\adddot}},
+ patentuk = {{UK-patent}{UK-pat\adddot}},
+ patentus = {{US-patent}{US-pat\adddot}},
+ patreq = {{patentans{\o}gning}{pat\adddot\ ans{\o}gn\adddot}},
+ patreqde = {{tysk patentans{\o}gning}{tysk pat\adddot\ ans{\o}gn\adddot}},
+ patreqeu = {{europ{\ae}isk patentans{\o}gning}{EU-pat\adddot\ ans{\o}gn\adddot}},
+ patreqfr = {{fransk patentans{\o}gning}{fransk pat\adddot\ ans{\o}gn\adddot}},
+ patrequk = {{britisk patentans{\o}gning}{brit\adddot\ pat\adddot\ ans{\o}gn\adddot}},
+ patrequs = {{amerikansk patentans{\o}gning}{am\adddot\ pat\adddot\ ans{\o}gn\adddot}},
file = {{fil}{fil}},
library = {{bibliotek}{bibl\adddot}},
- abstract = {{resum\'{e}}{resum\'{e}}},
- annotation = {{kommentarer}{komm\adddot}},
+ abstract = {{Abstract}{Abstract}},%akademically it is an abstract and not a "resumé". They are not the same thing.
+ annotation = {{kommentarer}{komment\adddot}},
commonera = {{efter vor tidsregning}{e\adddot v\adddot t\adddot}},
- beforecommonera = {{f\o r vor tidsregning}{f\adddot v\adddot t\adddot}},
- annodomini = {{efter Kristi f\o dsel}{e\adddot Kr\adddot}},
- beforechrist = {{f\o r Kristi f\o dsel}{f\adddot Kr\adddot}},
+ beforecommonera = {{f{\o}r vor tidsregning}{f\adddot v\adddot t\adddot}},
+ annodomini = {{efter Kristi f{\o}dsel}{e\adddot Kr\adddot}},
+ beforechrist = {{f{\o}r Kristi f{\o}dsel}{f\adddot Kr\adddot}},
circa = {{cirka}{ca\adddot}},
- spring = {{for\aa r}{for\aa r}},
+ spring = {{for{\aa}r}{for{\aa}r}},
summer = {{sommer}{sommer}},
- autumn = {{efter\aa r}{efter\aa r}},
+ autumn = {{efter{\aa}r}{efter{\aa}r}},
winter = {{vinter}{vinter}},
-% springN = {{}{}},% FIXME: missing
-% summerN = {{}{}},% FIXME: missing
-% autumnN = {{}{}},% FIXME: missing
-% winterN = {{}{}},% FIXME: missing
-% springS = {{}{}},% FIXME: missing
-% summerS = {{}{}},% FIXME: missing
-% autumnS = {{}{}},% FIXME: missing
-% winterS = {{}{}},% FIXME: missing
-% Q1 = {{}{}},% FIXME: missing
-% Q2 = {{}{}},% FIXME: missing
-% Q3 = {{}{}},% FIXME: missing
-% Q4 = {{}{}},% FIXME: missing
-% QD1 = {{}{}},% FIXME: missing
-% QD2 = {{}{}},% FIXME: missing
-% QD3 = {{}{}},% FIXME: missing
-% S1 = {{}{}},% FIXME: missing
-% S2 = {{}{}},% FIXME: missing
- am = {{formiddag}{form\adddot}},
- pm = {{eftermiddag}{efterm\adddot}},
+ springN = {{for{\aa}r, nordlige halvkugle}{for{\aa}r, nordlige halvkugle}},
+ summerN = {{sommer, nordlige halvkugle}{sommer, nordlige halvkugle}},
+ autumnN = {{efter{\aa}r, nordlige halvkugle}{efter{\aa}r, nordlige halvkugle}},
+ winterN = {{vinter, nordlige halvkugle}{vinter, nordlige halvkugle}},
+ springS = {{for{\aa}r, sydlige halvkugle}{for{\aa}r, sydlige halvkugle}},
+ summerS = {{sommer, sydlige halvkugle}{sommer, sydlige halvkugle}},
+ autumnS = {{efter{\aa}r, sydlige halvkugle}{efter{\aa}r, sydlige halvkugle}},
+ winterS = {{vinter, sydlige halvkugle}{vinter, sydlige halvkugle}},
+ Q1 = {{1\adddot~kvartal}{Q1}},
+ Q2 = {{2\adddot~kvartal}{Q2}},
+ Q3 = {{3\adddot~kvartal}{Q3}},
+ Q4 = {{4\adddot~kvartal}{Q4}},
+ QD1 = {{1\adddot~kvarter}{Q1}},%reference to academic quadrimesters, in Danish: kvarter, akademisk kvarter.
+ QD2 = {{2\adddot~kvarter}{Q2}},
+ QD3 = {{3\adddot~kvarter}{Q3}},
+ S1 = {{1\adddot~halv{\aa}r}{H1}},%or 1.~semester
+ S2 = {{2\adddot~halv{\aa}r}{H2}},%or 2.~semester
+ am = {{formiddag}{formiddag}},
+ pm = {{eftermiddag}{eftermiddag}},
}
\endinput
diff --git a/macros/latex/contrib/biblatex/latex/lbx/galician.lbx b/macros/latex/contrib/biblatex/latex/lbx/galician.lbx
index 25eed96d07..dbd5a0071a 100644
--- a/macros/latex/contrib/biblatex/latex/lbx/galician.lbx
+++ b/macros/latex/contrib/biblatex/latex/lbx/galician.lbx
@@ -548,7 +548,6 @@ nodate = {{sen data}{s\adddot d\adddot}},
% QD3 = {{}{}},% FIXME: missing
% S1 = {{}{}},% FIXME: missing
% S2 = {{}{}},% FIXME: missing
-
am = {{AM}{AM}},
pm = {{PM}{PM}},
}
diff --git a/macros/latex/contrib/biblatex/latex/lbx/spanish.lbx b/macros/latex/contrib/biblatex/latex/lbx/spanish.lbx
index 38121886d6..cd055ec351 100644
--- a/macros/latex/contrib/biblatex/latex/lbx/spanish.lbx
+++ b/macros/latex/contrib/biblatex/latex/lbx/spanish.lbx
@@ -284,7 +284,7 @@
bytranslatoranaf = {{traducido \lbx@lfromlang, anotado y epilogado por}%
{trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'{\i}l\adddotspace por}},
and = {{y}{y}},
- andothers = {{y~col\adddot}{y~col\adddot}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
andmore = {{et\adddotspace al\adddot}{et\adddotspace al\adddot}},
volume = {{volumen}{vol\adddot}},
volumes = {{vol\'umenes}{vols\adddot}},
diff --git a/macros/latex/contrib/biblatex/latex/lbx/turkish.lbx b/macros/latex/contrib/biblatex/latex/lbx/turkish.lbx
index 6e6711ff08..9d1b8db04d 100644
--- a/macros/latex/contrib/biblatex/latex/lbx/turkish.lbx
+++ b/macros/latex/contrib/biblatex/latex/lbx/turkish.lbx
@@ -453,6 +453,7 @@
november = {{Kas\i m}{Kas\adddot}},
december = {{Aral\i k}{Ara\adddot}},
langamerican = {{Amerikanca}{Amerikanca}},
+ langbasque = {{Bask\c{c}a}{Bask\c{c}a}},
langbrazilian = {{Brezilyanca}{Brezilyanca}},
langbulgarian = {{Bulgarca}{Bulgarca}},
langcatalan = {{Katalanca}{Katalanca}},
@@ -473,17 +474,21 @@
langlatin = {{Latince}{Latince}},
langlatvian = {{Letonca}{Letonca}},
langlithuanian = {{Litvanca}{Litvanca}},
+ langmarathi = {{Marathice}{Marathice}},
langnorwegian = {{Norve\c{c}\c{c}e}{Norve\c{c}\c{c}e}},
langpolish = {{Polonyaca}{Polonyaca}},
langportuguese = {{Portekizce}{Portekizce}},
+ langromanian = {{Rumence}{Rumence}},
langrussian = {{Rus\c{c}a}{Rus\c{c}a}},
langserbian = {{S\i rp\c{c}a}{S\i rp\c{c}a}},
langslovak = {{Slovak\c{c}a}{Slovak\c{c}a}},
langslovene = {{Slovence}{Slovence}},
langspanish = {{\.{I}spanyolca}{\.{I}spanyolca}},
langswedish = {{\.{I}sve\c{c}\c{c}e}{\.{I}sve\c{c}\c{c}e}},
+ langturkish = {{T\"{u}rk\c{c}e}{T\"{u}rk\c{c}e}},
langukrainian = {{Ukraynaca}{Ukraynaca}},
fromamerican = {{Amerikanca'dan}{Amerikanca'dan}},
+ frombasque = {{Bask\c{c}a'dan}{Bask\c{c}a'dan}},
frombrazilian = {{Brezilyanca'dan}{Brezilyanca'dan}},
frombulgarian = {{Bulgarca'dan}{Bulgarca'dan}},
fromcatalan = {{Katalanca'dan}{Katalanca'dan}},
@@ -504,15 +509,18 @@
fromlatin = {{Latince'den}{Latince'den}},
fromlatvian = {{Latvianca'dan}{Latvianca'dan}},
fromlithuanian = {{Litvanca'dan}{Litvanca'dan}},
+ frommarathi = {{Marathice'den}{Marathice'den}},
fromnorwegian = {{Norve\c{c}\c{c}e'den}{Norve\c{c}\c{c}e'den}},
frompolish = {{Polonyaca'dan}{Polonyaca'dan}},
fromportuguese = {{Portekizce'den}{Portekizce'den}},
+ fromromanian = {{Rumence'den}{Rumence'den}},
fromrussian = {{Rus\c{c}a'dan}{Rus\c{c}a'dan}},
fromserbian = {{S\i rp\c{c}a'dan}{S\i rp\c{c}a'dan}},
fromslovak = {{Slovak\c{c}a'dan}{Slovak\c{c}a'dan}},
fromslovene = {{Slovence'den}{Slovence'den}},
fromspanish = {{\.{I}spanyolca'dan}{\.{I}spanyolca'dan}},
fromswedish = {{\.{I}sve\c{c}\c{c}e'den}{\.{I}sve\c{c}\c{c}e'den}},
+ fromturkish = {{T\"{u}rk\c{c}e'den}{T\"{u}rk\c{c}e'den}},
fromukrainian = {{Ukraynaca'dan}{Ukraynaca'dan}},
countryde = {{Almanya}{DE}},
countryeu = {{Avrupa Birli\u{g}i}{AB}},
@@ -545,23 +553,23 @@
summer = {{Yaz}{Yaz}},
autumn = {{Sonbahar}{Sonbahar}},
winter = {{K\i \c{s}}{K\i \c{s}}},
-% springN = {{}{}},% FIXME: missing
-% summerN = {{}{}},% FIXME: missing
-% autumnN = {{}{}},% FIXME: missing
-% winterN = {{}{}},% FIXME: missing
-% springS = {{}{}},% FIXME: missing
-% summerS = {{}{}},% FIXME: missing
-% autumnS = {{}{}},% FIXME: missing
-% winterS = {{}{}},% FIXME: missing
-% Q1 = {{}{}},% FIXME: missing
-% Q2 = {{}{}},% FIXME: missing
-% Q3 = {{}{}},% FIXME: missing
-% Q4 = {{}{}},% FIXME: missing
-% QD1 = {{}{}},% FIXME: missing
-% QD2 = {{}{}},% FIXME: missing
-% QD3 = {{}{}},% FIXME: missing
-% S1 = {{}{}},% FIXME: missing
-% S2 = {{}{}},% FIXME: missing
+ springN = {{\.{I}lkbahar (Kuzey Yar\i mk\"{u}re)}{\.{I}lkbahar KY}},
+ summerN = {{Yaz (Kuzey Yar\i mk\"{u}re)}{Yaz KY}},
+ autumnN = {{Sonbahar (Kuzey Yar\i mk\"{u}re)}{Sonbahar KY}},
+ winterN = {{K\i \c{s} (Kuzey Yar\i mk\"{u}re)}{K\i \c{s} KY}},
+ springS = {{\.{I}lkbahar (G\"{u}ney Yar\i mk\"{u}re)}{\.{I}lkbahar GY}},
+ summerS = {{Yaz (G\"{u}ney Yar\i mk\"{u}re)}{Yaz GY}},
+ autumnS = {{Sonbahar (G\"{u}ney Yar\i mk\"{u}re)}{Sonbahar GY}},
+ winterS = {{K\i \c{s} (G\"{u}ney Yar\i mk\"{u}re)}{K\i \c{s} GY}},
+ Q1 = {{birinci \c{c}eyrek}{1\adddot \c{C}}},
+ Q2 = {{ikinci \c{c}eyrek}{2\adddot \c{C}}},
+ Q3 = {{\"{u}\c{c}\"{u}nc\"{u} \c{c}eyrek}{3\adddot \c{C}}},
+ Q4 = {{d\"{o}rd\"{u}nc\"{u} \c{c}eyrek}{4\adddot \c{C}}},
+ QD1 = {{birinci d\"{o}rt\"{u}k}{1\adddot D}},
+ QD2 = {{ikinci d\"{o}rt\"{u}k}{2\adddot D}},
+ QD3 = {{\"{u}\c{c}\"{u}nc\"{u} d\"{o}rt\"{u}k}{3\adddot D}},
+ S1 = {{birinci yar\i y\i l}{1\adddot YY}},
+ S2 = {{ikinci yar\i y\i l}{1\adddot YY}},
am = {{\"{o}\u{g}leden \"{o}nce}{\"{O}\"{O}}},
pm = {{\"{o}\u{g}leden sonra}{\"{O}S}},
}
diff --git a/macros/latex/contrib/chess-problem-diagrams/README b/macros/latex/contrib/chess-problem-diagrams/README
index 6e9503a16e..bc5dc2fecf 100644
--- a/macros/latex/contrib/chess-problem-diagrams/README
+++ b/macros/latex/contrib/chess-problem-diagrams/README
@@ -1,5 +1,5 @@
diagram --- A package for typesetting chessproblems
-Version v1.15 / Stefan Hoening 1994-2019
+Version v1.21 / Stefan Hoening 1994-2022
CONTENTS
@@ -17,7 +17,7 @@ Install the fonts package (bartel-chess-fonts) into your
tex installation.
Run TeX/LaTeX on diagram.ins to unpack the dtx.
-Put the extracted 'diagram.sty' into tex/latex/diagram.
+Put the extracted 'cpdparse.sty' and 'diagram.sty' into tex/latex/diagram.
DOCUMENTATION
diff --git a/macros/latex/contrib/chess-problem-diagrams/diagram.dtx b/macros/latex/contrib/chess-problem-diagrams/diagram.dtx
index 249d14058b..883588b391 100644
--- a/macros/latex/contrib/chess-problem-diagrams/diagram.dtx
+++ b/macros/latex/contrib/chess-problem-diagrams/diagram.dtx
@@ -13,9 +13,9 @@
%%
%%
% \fi
-% \def\fileversion{v1.15}
-% \def\docdate{2019/12/28}
-% \CheckSum{4545}
+% \def\fileversion{v1.21}
+% \def\docdate{2022/06/14}
+% \CheckSum{4577}
% \changes{v0.1}{15 Februar 2004}{First Version}
% \changes{v0.2}{23 Februar 2004}{Added the documentation for the
% {\itshape information collecting} macros which may be used
@@ -76,6 +76,24 @@
% \changes{v1.14}{02 September 2019}{Fixed issue with stereo- and space-diagrams.}
% \changes{v1.15}{28 December 2019}{Fixed frame issue with stereo- and space-diagrams.\\
% Added hook commands for begin/end diagram.}
+% \changes{v1.16}{09 February 2020}{Fixed date display issue in
+% figurine environment.\\
+% Added hook commands to figurine environment.\\
+% Fixed documentation bug: separation character in themes command is
+% comma not semicolon.\\
+% command diagnumbering fixed: boolean is changed to true globally.}
+% \changes{v1.17}{27 December 2020}{Added generation of cpdparse.sty
+% containing generic command for parsing lists.}
+% \changes{v1.18}{04 February 2021}{03f/0be:om: Typo: above@newlne\\
+% 03f/035:om: solnamestype has no effect}
+% \changes{v1.19}{04 March 2021}{Minor fix in cl@arsol\\
+% Added (empty) command gerne.}
+% \changes{v1.20}{13 June 2022}{Introduced two booleans to better
+% control displaying diagram number globally and locally.\\
+% Removed the old boolean 'di@no'.}
+% \changes{v1.21}{14 June 2022}{Impletemted issue: 03f/309:\\
+% handle empty arguments in information collecting commands\\
+% Fixed typo in @dia@fidealbum command.}
%
% \DoNotIndex{\@arabic,\def,\@idxitem,\@ifnextchar,\@ifstar,
% \@ne,\@ptsize,\ ,\advance,\AtEndOfPackage,\begin,\begingroup,
@@ -284,7 +302,9 @@
% \item \DescribeMacro{\specialdiagnum}
% May be used to suppress the default diagram numbering (which
% uses a counter) and instead directly providing a diagram
-% "number" which may be an arbritary text.
+% "number" which may be an arbritary text. This may also be used to
+% suppress displaying a diagram number by providing an empty argument
+% \verb+{}+.
% \item \DescribeMacro{\sourcenr}
% May be used to specify the number which was used for the
% problem inside an originals section.
@@ -343,11 +363,22 @@
% authors original comment.)
% \item \DescribeMacro{\themes}
% May be used to specify themes displayed in the problem.
-% Different themes should be separated with ";~". When creating a
+% Different themes should be separated with ",~". When creating a
% theme index, the themes will automatically be used to create
% the register.
+% \item \DescribeMacro{\genre}
+% May be used to specify genre of the problem.
+% Different genres should be separated with ",~".
+% The values are intended to using \LaTeX\-import within the PDB.
% \end{itemize}
%
+% When providing an empty argument to commands \verb+\award+,
+% \verb+\after+, \verb+\dedic+, \verb+\correction+ and \verb+\version+
+% only a warning is issued to the logfile. In previous
+% versions of \verb+diagram.sty+ using empty arguments with the
+% mentioned commands produced empty lines above the diagram.
+%
+%
% There are some commands which not only collect information but
% normally direct result in a change of the diagram. These are:
%
@@ -526,7 +557,7 @@
% need smaller or larger boards. This can be achieved by
% specifying the rows and columns as an optional parameter to the
% |\begin{diagram}| environment. You first have to specify the
-% lines and then the rows as the following examples shows.
+% columns and then the rows as the following examples shows.
%
% \bigskip
% \begin{diagram}[17x11]
@@ -644,13 +675,13 @@
% \DescribeMacro{\noframe}
% \DescribeMacro{\noinnerframe}
% To stylize a cylindric board one typically does not show parts
-% of the frame. When using |\verticalcylinder| the horizontal
+% of the frame. When using |\verticalcylinder|\, the horizontal
% lines of the outer frame will not be drawn.
-% |\horizontalcylinder| suppresses the drawing of the vertical
-% lines of the outer frame. Using |\noframe| completely supresses
-% the outer frame. |\noinnerframe| suppresses the innerframe.
+% |\horizontalcylinder|\, suppresses the drawing of the vertical
+% lines of the outer frame. Using |\noframe|\, completely supresses
+% the outer frame. |\noinnerframe|\, suppresses the innerframe.
% In case of stereo- or space-chess-diagrams |\verticalcylinder|,
-% |\horizontalcylinder| and |\noframe| suppresses the inner
+% |\horizontalcylinder|\, and |\noframe|\, suppresses the inner
% frame.
%
% \subsection{Change the coloring of the fields}
@@ -985,7 +1016,7 @@
% Specifies the preamble of our style file.
% \begin{macrocode}
%<*style>
-\ProvidesPackage{diagram}[2019/12/28]
+\ProvidesPackage{diagram}[2022/06/19]
% \end{macrocode}
%
% \begin{macro}{\DefaultDiagramSize}
@@ -1043,7 +1074,9 @@
\newif\ifspace@vertical
\def\spacehorizontal{\space@verticalfalse}
-\newif\ifdi@no
+% \newif\ifdi@no
+\newboolean{@cpd@numbering@global}
+\newboolean{@cpd@numbering@local}
\newcounter{board@nr}
\renewcommand{\theboard@nr}{\thediag}
% \newif\iffigcnt
@@ -1278,6 +1311,7 @@
% \end{macro}
% \end{macro}
%
+%
% \begin{macro}{\diagram}
% \begin{macro}{\@diagram}
% Defines the code executed in |\begin{diagram}|. In case no
@@ -1550,6 +1584,7 @@
\let\month=\ds@month%
\let\year=\ds@year%
\let\label=\ds@label%
+ \cpd@begindiagram@hook%
}
\def\endfigurine{%
@@ -1578,6 +1613,7 @@
\fi%
%
\@show@figurine%
+ \cpd@enddiagram@hook%
\endgroup%
}
%
@@ -1727,10 +1763,15 @@
%
% \begin{macrocode}
\def\spacelayout#1{\csname space@#1\endcsname}
-\def\nodiagnumbering{\global\di@nofalse}
+\def\nodiagnumbering{%
+ % \global\di@nofalse
+ \setboolean{@cpd@numbering@global}{false}
+}
\newcommand*{\@dianumber@prefix}{}
\def\diagnumbering#1{%
- \di@notrue\diagnum{\@ne}%
+ \setboolean{@cpd@numbering@global}{true}%
+ % \global\di@notrue%
+ \diagnum{\@ne}%
\gdef\thediag{\@dianumber@prefix\csname @#1\endcsname\c@board@nr}%
}
% \end{macrocode}
@@ -1761,9 +1802,16 @@
%
% \begin{macrocode}
\def\specialdiagnum#1{%
- \@specialtrue%
- \number@tk={#1}\@numbertrue\def\thediag{#1}\def\@currentlabel{#1}%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ % We disable displaying the diagram number
+ \setboolean{@cpd@numbering@local}{false}%
+ }{%
+ \setboolean{@cpd@numbering@local}{true}%
+ \@specialtrue%
+ \number@tk={#1}\@numbertrue%
+ \def\thediag{#1}\def\@currentlabel{#1}%
+ \ignorespaces%
+ }
}
% \end{macrocode}
%
@@ -1841,24 +1889,44 @@
\ignorespaces%
}
\def\award#1{%
- \award@tk={#1}\@awardtrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'award' argument.^^J}%
+ }{%
+ \award@tk={#1}\@awardtrue%
+ \ignorespaces%
+ }%
}
\def\version#1{%
- \version@tk={#1}\@versiontrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'version' argument.^^J}%
+ }{%
+ \version@tk={#1}\@versiontrue%
+ \ignorespaces%
+ }%
}
\def\after#1{%
- \after@tk={#1}\@aftertrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'after' argument.^^J}%
+ }{%
+ \after@tk={#1}\@aftertrue%
+ \ignorespaces%
+ }%
}
\def\correction#1{%
- \correction@tk={#1}\@correctiontrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'correction' argument.^^J}%
+ }{%
+ \correction@tk={#1}\@correctiontrue%
+ \ignorespaces%
+ }%
}
\def\dedication#1{%
- \dedic@tk={#1}\@dedicationtrue%
- \ignorespaces%
+ \ifthenelse{\equal{}{#1}}{%
+ \message{^^JWARNING: ignoring empty 'correction' argument.^^J}%
+ }{%
+ \dedic@tk={#1}\@dedicationtrue%
+ \ignorespaces%
+ }%
}
\def\fidealbum#1{%
\fidealbum@tk={#1}\@fidealbumtrue%
@@ -1968,6 +2036,9 @@
\theme@tk={#1}\@themetrue%
\ignorespaces%
}
+\def\genre#1{%
+ \relax% Currently not used within diagram.sty
+}
\long\def\comment#1{%
\comment@tk={#1}\@commenttrue%
\ignorespaces%
@@ -2173,7 +2244,10 @@
% single paragraph.
% \begin{macrocode}
\def\@dia@number{%
- \ifdi@no\above@newline{\authorfont\thediag}\fi%
+ %\ifdi@no\above@newline{\authorfont\thediag}\fi%
+ \ifthenelse{\boolean{@cpd@numbering@local}}{%
+ \above@newline{\authorfont\thediag}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -2313,7 +2387,7 @@
\def\@dia@fidealbum{%
\if@fidealbum%
- \above@newlne%
+ \above@newline%
{\expandafter\@show@album\the\fidealbum@tk;}%
\fi%
}
@@ -2579,26 +2653,7 @@
\sourcefont%
\if@sourcenr\the\sourcenr@tk\ \fi%
\the\source@tk%
- \if@year%
- \ \ %
- \if@day%
- \ifnum\from@month>\z@%
- \the\day@tk.%
- \write@month\from@month%
- \ifnum\to@month>\z@%
- -\write@month\to@month%
- \fi%
- .%
- \fi%
- \else%
- \write@month\the\from@month%
- \ifnum\to@month>\z@%
- -\write@month\the\to@month%
- \fi%
- /%
- \fi%
- \the\year@tk%
- \fi%
+ \if@date\ \ \fi\@dia@date%
\if@issue , \the\issue@tk\fi%
\if@pages , \the\pages@tk\fi%
\fi}%
@@ -2681,7 +2736,7 @@
}
\def\@months#1-#2;{\from@month=#1\to@month=#2\@datetrue}
\def\@dia@writename#1; {\above@newline{\authorfont\@dianame#1; }\l@@klist}
-\def\@sol@writename#1; {\sep@names\@dianame#1; \l@@klist}
+\def\@sol@writename#1; {\sep@names\@solname#1; \l@@klist}
\def\name@sep{,\ }
\def\sep@names{\if@notfirst\name@sep\else\@notfirsttrue\fi}
\def\@checkshort#1/#2#3;{%
@@ -2720,7 +2775,7 @@
\def\@normalname#1; {#1}
\def\space@vertical{\space@verticaltrue}
\def\space@horizontal{\space@verticalfalse}
-\def\cl@arsol{\immediate\openout\s@lfd=\jobname.sol}
+\def\cl@arsol{\immediate\openout\s@lfd=\jobname.sol\relax}
\def\getc@lor#1{%
\if#1\ds@white%
\help@a\z@\global%
@@ -3032,6 +3087,11 @@
\def\@set@label#1;{\ifds@label\label{#1}\fi}
\def\init@vars{%
\global\s@lufalse
+ \ifthenelse{\boolean{@cpd@numbering@global}}{%
+ \setboolean{@cpd@numbering@local}{true}%
+ }{%
+ \setboolean{@cpd@numbering@local}{false}%
+ }%
\setboolean{cpd@checkPieceCounts}{false}%
\setcounter{cpd@defWhitePieces}{\z@}%
\setcounter{cpd@defBlackPieces}{\z@}%
@@ -3574,4 +3634,29 @@
%</style>
% \end{macrocode}
%
+% \section{The implementation of cpdparse.sty}
+%
+% The following contains the style file \emph{cpdparse.sty}, which
+% implements generic parsing of lists.
+%
+% \begin{macrocode}
+%<*cpdparse>
+\ProvidesPackage{cpdparse}[2020/12/27]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\cpd@parse@list{\futurelet\cpd@parse@lookahead\cpd@parse@check}
+\def\cpd@parse@check{%
+ \ifx\cpd@parse@lookahead\relax\relax%
+ \let\cpd@parse@next=\relax%
+ \else%
+ \let\cpd@parse@next=\cpd@parse@action%
+ \fi%
+ \cpd@parse@next%
+}
+% \end{macrocode}
+%
+%</cpdparse>
+%
+%
% \Finale
diff --git a/macros/latex/contrib/chess-problem-diagrams/diagram.ins b/macros/latex/contrib/chess-problem-diagrams/diagram.ins
index 0c2928c9fe..8bfba54fe7 100644
--- a/macros/latex/contrib/chess-problem-diagrams/diagram.ins
+++ b/macros/latex/contrib/chess-problem-diagrams/diagram.ins
@@ -2,5 +2,6 @@
\askforoverwritefalse
\generate{%
\file{diagram.sty}{\from{diagram.dtx}{style}}%
+ \file{cpdparse.sty}{\from{diagram.dtx}{cpdparse}}%
}
\endbatchfile
diff --git a/macros/latex/contrib/chess-problem-diagrams/diagram.pdf b/macros/latex/contrib/chess-problem-diagrams/diagram.pdf
index 0fe72da32d..9ea04fbd39 100644
--- a/macros/latex/contrib/chess-problem-diagrams/diagram.pdf
+++ b/macros/latex/contrib/chess-problem-diagrams/diagram.pdf
Binary files differ
diff --git a/macros/latex/contrib/microtype/README.md b/macros/latex/contrib/microtype/README.md
index 9b8dbbff0a..0a3faccb4f 100644
--- a/macros/latex/contrib/microtype/README.md
+++ b/macros/latex/contrib/microtype/README.md
@@ -4,7 +4,7 @@ The `microtype` package
**Subliminal refinements towards typographical perfection**
- (v3.0e -- 2022/06/20)
+ (v3.0f -- 2022/06/23)
Overview
diff --git a/macros/latex/contrib/microtype/microtype-code.pdf b/macros/latex/contrib/microtype/microtype-code.pdf
index ad172ab136..fa07085058 100644
--- a/macros/latex/contrib/microtype/microtype-code.pdf
+++ b/macros/latex/contrib/microtype/microtype-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/microtype/microtype-utf.dtx b/macros/latex/contrib/microtype/microtype-utf.dtx
index 2d6110dd2e..fc6226a095 100644
--- a/macros/latex/contrib/microtype/microtype-utf.dtx
+++ b/macros/latex/contrib/microtype/microtype-utf.dtx
@@ -27,7 +27,7 @@
\ProvidesFile
%</!EBGaramond>
%<*driver>
- {\jobname.dtx}[2022/06/20 v3.0e]
+ {\jobname.dtx}[2022/06/23 v3.0f]
%</driver>
%<CharisSIL> {mt-CharisSIL.cfg}[2017/07/07 v1.1 microtype config. file: Charis SIL (RS)]
%<LatinModernRoman> {mt-LatinModernRoman.cfg}[2021/02/21 v1.1 microtype config. file: Latin Modern Roman (RS)]
@@ -37,8 +37,7 @@
%<TU-empty> {mt-TU-empty.cfg}[2021/06/22 v1.1 microtype config. file: fonts with nonstandard glyph set (RS)]
%<*driver>
\makeatletter
-\AddToHook{package/doc/before}{\pkgcls@targetdate=1 \def\pkgcls@targetlabel{v2}}
-\documentclass[10pt,a4paper]{ltxdoc}
+\documentclass[10pt,a4paper,doc2]{ltxdoc}
\usepackage{fontspec}
\usepackage{luatexbase}
\RequireLuaModule{luainputenc}
diff --git a/macros/latex/contrib/microtype/microtype.dtx b/macros/latex/contrib/microtype/microtype.dtx
index eb724cae42..1df1413136 100644
--- a/macros/latex/contrib/microtype/microtype.dtx
+++ b/macros/latex/contrib/microtype/microtype.dtx
@@ -37,7 +37,7 @@
%<lua-> {microtype-luatex.def}
%<xe-> {microtype-xetex.def}
%<*package|letterspace|m-t|pdf-|lua-|xe-|show>
- [2022/06/20 v3.0e
+ [2022/06/23 v3.0f
%<package> Micro-typographical refinements
%<letterspace> Robust letterspacing
%<show> Visual debugging for the microtype package
@@ -52,8 +52,8 @@
%<luafile>local microtype = microtype
%<luafile>microtype.module = {
%<luafile> name = "microtype",
-%<luafile> version = "3.0e",
-%<luafile> date = "2022/06/20",
+%<luafile> version = "3.0f",
+%<luafile> date = "2022/06/23",
%<luafile> description = "microtype module.",
%<luafile> author = "E. Roux, R. Schlicht and P. Gesang",
%<luafile> copyright = "E. Roux, R. Schlicht and P. Gesang",
@@ -3337,9 +3337,10 @@
% `\contributor NightShade <@\at @>', ^^A https://tex.stackexchange.com/users/260836/nightshade
% \contributor Nelson Lago <@\at @>, ^^A https://github.com/urrameu
% \contributor Brian Dunn <@\at @>, ^^A https://github.com/bdtc
-% \contributor Ralf Steinle <rasteinle\at web.de>
+% \contributor Ralf Steinle <rasteinle\at web.de>,
+% \contributor Denis Bitouz\'e <@\at @> ^^A https://tex.stackexchange.com/users/18401/denis-bitouz%c3%a9
% and
-% \contributor Denis Bitouz\'e <@\at @>. ^^A https://tex.stackexchange.com/users/18401/denis-bitouz%c3%a9
+% \contributor Christophe Dervieux <@\at @>. ^^A https://github.com/cderv
%
%\iffalse
%\section{History of micro-typography} ^^A some time ...
@@ -3486,6 +3487,8 @@
%
%\VersionDate{\expandafter\@gobble\fileversion}{\filedate}
%
+%\VersionDate{3.0e}{2022/06/20}
+%
%\VersionDate{3.0d}{2022/03/14}
%
%\VersionDate{3.0c}{2022/02/22}
@@ -3864,11 +3867,11 @@
%^^A\DoNotIndex{\adjustspacing,\copyfont,\expandglyphsinfont,
%^^A \ignoreligaturesinfont,\outputmode,\protrudechars,\tracingfonts} ^^A luatex
%\DoNotIndex{\eplain,\usepkg@pkg} ^^A eplain
-%\DoNotIndex{\@backslashchar,\@car,\@cclvi,\@classoptionslist,\@currext,
-% \@currname,\@defaultunits,\@elt,\@empty,\@@enc@update,\@eqnnum,\@expandtwoargs,
-% \@firstofone,\@firstoftwo,\@fontenc@load@list,\@footnotetext,\@gobble,\@gobbletwo,
-% \@ifclassloaded,\@ifl@t@r,\@ifl@aded,\@ifpackagelater,\@ifpackageloaded,\@ifstar,
-% \@ifundefined,\@item,\@let@token,\@m,\@M,\@makeother,\@minus,\@mpfootnotetext,
+%\DoNotIndex{\@backslashchar,\@car,\@cclvi,\@changed@cmd,\@classoptionslist,
+% \@current@cmd,\@currext,\@currname,\@defaultunits,\@empty,\@@enc@update,
+% \@eqnnum,\@expandtwoargs,\@firstofone,\@firstoftwo,\@footnotetext,\@gobble,
+% \@gobbletwo,\@ifclassloaded,\@ifl@t@r,\@ifl@aded,\@ifpackagelater,\@ifpackageloaded,
+% \@ifstar,\@ifundefined,\@item,\@let@token,\@m,\@M,\@makeother,\@minus,\@mpfootnotetext,
% \@nameuse,\@ne,\@newlistfalse,\@nil,\@nnil,\@onelevel@sanitize,\@onlypreamble,
% \@pkgextension,\@plus,\@ptionlist,\@removeelement,\@secondoftwo,\@spaces,\@sptoken,
% \@tempa,\@tempb,\@tempc,\@tempcnta,\@tempcntb,\@tempdima,\@typeset@protect,
@@ -3877,16 +3880,17 @@
% \maybe@ic@,\nfss@text,\not@math@alphabet,\on@line,\p@,\set@display@protect,
% \strip@prefix,\strip@pt,\@text@composite,\tw@,\z@,\z@skip,\zap@space,
% \active,\bfseries,\documentclass,\dotfill,\fbox,\fboxrule,\fboxsep,\fmtversion,
-% \footnotesize,\huge,\Huge,\itshape,\large,\Large,\LARGE,\leavevmode,\llap,
-% \makeatletter,\makebox,\mathrm,\mbox,\mdseries,\medskip,\newbox,\newcommand,
-% \newcount,\newdimen,\newif,\newline,\newskip,\newtoks,\nobreak,\nonfrenchspacing,
-% \normalbaselineskip,\normalsize,\numberline,\obeylines,\par,\parbox,\providecommand,
-% \quad,\raggedright,\renewcommand,\rmfamily,\scalebox,\sffamily,\scriptsize,\scshape,
-% \slshape,\small,\space,\strut,\textwidth,\texttt,\tiny,\tracingnone,\ttfamily,
-% \upshape,\usefont,\tiny,\AddToHook,\AtBeginDocument,\AtEndOfPackage,\CheckCommand,
-% \CurrentOption,\DeclareOption,\DeclareRobustCommand,\IfFileExists,\IfFormatAtLeastTF,
-% \InputIfFileExists,\MessageBreak,\PackageError,\PackageInfo,\PackageWarning,
-% \PassOptionsToPackage,\ProcessOptions,\RawNoindent,\RequirePackage,\UnicodeEncodingName}
+% \fontseriesforce,\fontshapeforce,\footnotesize,\huge,\Huge,\itshape,\large,\Large,
+% \LARGE,\leavevmode,\llap,\makeatletter,\makebox,\mathrm,\mbox,\mdseries,\medskip,
+% \newbox,\newcommand,\newcount,\newdimen,\newif,\newline,\newskip,\newtoks,\nobreak,
+% \nonfrenchspacing,\normalbaselineskip,\normalshape,\normalsize,\numberline,\obeylines,
+% \par,\parbox,\providecommand,\quad,\raggedright,\renewcommand,\rmfamily,\scalebox,
+% \sffamily,\scriptsize,\scshape,\slshape,\small,\space,\sscshape,\strut,\swshape,
+% \textwidth,\texttt,\tiny,\tracingnone,\ttfamily,\upshape,\ulcshape,\usefont,\tiny,
+% \AddToHook,\AtBeginDocument,\AtEndOfPackage,\CheckCommand,\CurrentOption,\DeclareOption,
+% \DeclareRobustCommand,\IfFileExists,\IfFormatAtLeastTF,\InputIfFileExists,\MessageBreak,
+% \PackageError,\PackageInfo,\PackageWarning,\PassOptionsToPackage,\ProcessOptions,
+% \RawNoindent,\RequirePackage,\UnicodeEncodingName}
%^^A\DoNotIndex{\add@accent,\cf@encoding,\curr@fontshape,\define@newfont,
%^^A \do@subst@correction,\f@encoding,\f@family,\f@size,\font@name,\fontencoding,
%^^A \fontseries,\fontshape,\glb@currsize,\glb@settings,\normalfont,\pickup@font,
@@ -8310,15 +8314,19 @@ time will almost certainly lead to undesired results. Have your choice!}%
% \end{macrocode}
%\end{macro}
%\begin{macro}{\MT@prot@iflicrcmd}
+%\changes{v3.0f}{2022/06/22}{no need to know about encodings
+% (also fixes \githubissue{20}, reported by
+% \contributor Christophe Dervieux <@\at @>)}
% Fun with <LICR>:
-% Test if the first command of the third command of the first command
-% is \cmd\@text@composite, in which case also grab the next token,
+% If we have an encoding command, test if the first command of the third command
+% (\eg, |\T1\"|) is \cmd\@text@composite, in which case also grab the next token,
% otherwise it should be a text command.
% \begin{macrocode}
\def\MT@getthird#1#2#3#4\@nil{#3}
-\def\MT@prot@iflicrcmd#1{%
- \MT@exp@cs\MT@prot@iffirstcmd{#1-cmd}{%
- \expandafter\expandafter\expandafter\let
+\def\MT@prot@iflicrcmd{%
+ \MT@prot@iffirstcmd\@current@cmd\@secondoftwo\@firstofone
+ {\MT@prot@iffirstcmd\@changed@cmd\@firstofone\@gobble}%
+ {\expandafter\expandafter\expandafter\let
\expandafter\expandafter\expandafter\@tempa
\expandafter\MT@getthird\MT@prot@next\relax\@nil
\MT@exp@two@c\ifx\@car\@tempa\relax\@nil\@text@composite
@@ -8326,34 +8334,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\else
\def\MT@temp*##1{\MT@prot@l{\the\MT@toks##1}}%
\fi
- \MT@tlist@break
- }\relax
-}
-%</package>
-% \end{macrocode}
-%\end{macro}
-%\begin{macro}{\MT@enc@list}
-%\changes{v3.0e}{2022/06/09}{new macro: no more guesswork about encodings}
-% The list of all loaded font encodings. For \LaTeX\ formats older than
-% 2020/02/11 (before \cmd\@fontenc@load@list\ was introduced), we don't
-% bother doing any guesswork (like \pkg{babel} used to do). Also, we
-% don't consider the older <EU1>/<EU2> encodings.
-% \begin{macrocode}
-%<pdf-|lua-|xe->\def\MT@enc@list
-%<pdf-> {{T1}{OT1}}
-%<lua-|xe-> {{TU}}
-%<*package>
-\MT@addto@setup{%
- \ifx\@fontenc@load@list\@undefined \else
- \def\@elt#1{,#1,}%
- \edef\@tempa{\@fontenc@load@list}%
- \MT@map@clist@c\@tempa{%
- \MT@ifempty{#1}\relax{%
- \MT@in@tlist{#1}\MT@enc@list
- \ifMT@inlist@\else\edef\MT@enc@list{\MT@enc@list{#1}}\fi
- }%
- }%
- \fi
+ }%
}
% \end{macrocode}
%\end{macro}
@@ -8440,6 +8421,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
%\changes{v3.0e}{2022/06/09}{new macro: make list of commands extensible}
%\changes{v3.0e}{2022/05/13}{ignore \cmd\@empty}
%\changes{v3.0e}{2022/06/15}{add standard font selection commands}
+%\changes{v3.0f}{2022/06/22}{add \microtype's commands}
% Here's the list of commands to be added to our toks.
% We'll postpone the handling of commands whose argument would have
% to be processed (\eg, \cmd\textrm).
@@ -8449,14 +8431,23 @@ time will almost certainly lead to undesired results. Have your choice!}%
{S\rmfamily}{S\sffamily}{S\ttfamily}{S\mdseries}{S\bfseries}%
{S\upshape}{S\slshape}{S\itshape}{S\scshape}%
{S\normalfont}{S\selectfont}%
+ {S\lsstyle}%
{S\tiny}{S\scriptsize}{S\footnotesize}{S\small}{S\normalsize}%
{S\large}{S\Large}{S\LARGE}{S\huge}{S\Huge}%
{O\fontencoding}{O\fontfamily}{O\fontseries}{O\fontshape}%
+ {O\microtypesetup}{O\microtypecontext}%
{T\fontsize}%
}
% \end{macrocode}
-%\end{macro}
-% If \pkg{yfonts} is loaded, we add the relevant commands (again, those that
+% \LaTeX\ 2020/02/02 introduced some more commands.
+%\changes{v3.0f}{2022/06/22}{add new NFSS commands}
+% \begin{macrocode}
+\IfFormatAtLeastTF{2020/02/02}
+ {\g@addto@macro\MT@prot@check@cmds{%
+ {S\swshape}{S\ulcshape}{S\sscshape}{S\normalshape}%
+ {O\fontseriesforce}{O\fontshapeforce}}}{}
+% \end{macrocode}
+% If \pkg{yfonts} is loaded, we add the relevant commands (again, only those that
% don't take an argument).
% \begin{macrocode}
\MT@addto@setup{%
@@ -8464,6 +8455,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
{\g@addto@macro\MT@prot@check@cmds{{S\frakfamily}{S\swabfamily}{S\gothfamily}}}%
}
% \end{macrocode}
+%\end{macro}
%\begin{macro}{\MT@prot@get@first@group}
% If next char is |{|, start a group and try again, else continue until
% we find a beginning char.
@@ -8503,7 +8495,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\let\MT@prot@ifmacro\MT@prot@ifmacro@
\MT@map@tlist@c\MT@prot@check@cmds\MT@prot@check
% \end{macrocode}
-% \dots~or a command/active char whose first command is one of the following.
+% \dots~or a command/active char whose first command is one of the following:
% \begin{macrocode}
\MT@prot@ifmacro{%
\MT@prot@iffirstcmd\UTFviii@two@octets{%
@@ -8522,7 +8514,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
% \end{macrocode}
% or, finally, a <LICR> command.
% \begin{macrocode}
- \MT@map@tlist@c\MT@enc@list\MT@prot@iflicrcmd
+ \MT@prot@iflicrcmd
}%
}%
}%
@@ -19992,7 +19984,7 @@ This is the current font stretched by 5\%, normal, and shrunk by 5\%:
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \CheckSum{12609}
+% \CheckSum{12598}
%
% \Finale
%
diff --git a/macros/latex/contrib/microtype/microtype.pdf b/macros/latex/contrib/microtype/microtype.pdf
index 2d895f24f7..642f98889a 100644
--- a/macros/latex/contrib/microtype/microtype.pdf
+++ b/macros/latex/contrib/microtype/microtype.pdf
Binary files differ
diff --git a/macros/latex/contrib/schwalbe-chess/README b/macros/latex/contrib/schwalbe-chess/README
index 34562fb943..fe64042379 100644
--- a/macros/latex/contrib/schwalbe-chess/README
+++ b/macros/latex/contrib/schwalbe-chess/README
@@ -1,5 +1,5 @@
schwalbe --- A package for typesetting chessproblems
-Version v2.9 / Stefan Hoening 2012-2020
+Version v2.12 / Stefan Hoening 2012-2022
CONTENTS
diff --git a/macros/latex/contrib/schwalbe-chess/schwalbe.dtx b/macros/latex/contrib/schwalbe-chess/schwalbe.dtx
index 62dbe69dcc..15b4b459fc 100644
--- a/macros/latex/contrib/schwalbe-chess/schwalbe.dtx
+++ b/macros/latex/contrib/schwalbe-chess/schwalbe.dtx
@@ -13,9 +13,9 @@
%%
%%
% \fi
-% \def\fileversion{v2.9}
-% \def\docdate{2022/05/28}
-% \CheckSum{2247}
+% \def\fileversion{v2.12}
+% \def\docdate{2022/06/16}
+% \CheckSum{2266}
% \changes{v1.1}{03 June 2011}{Reflecting change in command
% @writename inside diagram.sty}
% \changes{v1.2}{01 July 2011}{Added parameter for Band to Heft
@@ -59,6 +59,17 @@
% Loesungen environment.}
% \changes{v2.9}{28 May 2022}{Added code to simplify measuring size of
% articles.}
+% \changes{v2.10}{02 June 2022}{Added missing dots (.) in commands
+% cpd@Loesung and cpd@Loesung@star.\\
+% Added commands win and loose.\\
+% Volume is provided as arabic number in 'Heft' command now.\\
+% Fixed issue with Ruler as 'AddToHook' command is not available in
+% old \LaTeX{} installations.}
+% \changes{v2.11}{13 June 2022}{Changed to depend on diagram.sty from
+% 13 June 2022.}
+% \changes{v2.12}{19 June 2022}{Moved ruler code to separate style
+% file swruler.sty.\\
+% Added class option 'ruler' to activate displaying the ruler.}
%
% \DoNotIndex{\@arabic,\def,\@idxitem,\@ifnextchar,\@ifstar,
% \@ne,\@ptsize,\ ,\advance,\AtEndOfPackage,\begin,\begingroup,
@@ -108,7 +119,9 @@
% Parameter in der angegebenen Reihenfolge:
%
% \begin{enumerate}
-% \item der Band, zu dem das Heft gehört
+% \item der Band, zu dem das Heft gehört (als arabische Zahl)\footnote{In den
+% vorherigen Fassungen der schwalbe.cls wurde hier die römische
+% Darstellung der Zahl angegeben.}
% \item die Nummer des Heftes
% \item der Monat des Erscheinens als Zahl
% \item das Jahr des Erscheinens
@@ -119,7 +132,7 @@
% der Seitenummmer 361 beginnt wird demzufolge folgendermassen
% eingeleitet:
%
-% \verb+\Heft{XXXIV}{299}{12}{2019}{361}+
+% \verb+\Heft{34}{299}{12}{2019}{361}+
%
% \DescribeEnv{Editorial}
% Die \verb+Editorial+ Umgebung benötigt einen Parameter, der
@@ -331,7 +344,7 @@
%
% \DescribeEnv{Loeserliste}
% Nach dem einleitenden \verb+\begin{Loeserliste}+ ist als
-% Parameter das Jahr anzugeben, auf dass sich die Löserliste
+% Parameter das Jahr anzugeben, auf das sich die Löserliste
% bezieht.
%
% \DescribeEnv{Turnierausschreibung}
@@ -371,6 +384,11 @@
% zwischen den Gliedern der Abkürzung wählen. Daher definiert
% der Style Befehle für einige Häufig vorkommende Abkürzungen:
%
+% \DescribeMacro{\win}
+% \DescribeMacro{\loose}
+% Für die Notation von Studienlösungen gibt es die Befehle \verb+\win+
+% und \verb+\loose+.
+%
% \medskip
% \begin{tabular}{|l|l|l|}
% \hline
@@ -429,12 +447,35 @@
% \DescribeMacro{\mal}
% Als Kurzschreibweise für das $\times$ Symbol ist der Befehl \verb+\mal+ definiert.
%
+% \DescribeMacro{\ShowRuler}
+% Um den Umfang der einzelnen Artikel einfacher Abschätzen zu können,
+% kann man mittels \verb+\ShowRuler+ ein Lineal auf jeder Seite
+% anzeigen lassen.
+% Der Befehl erwartet als Parameter den \textbf{x}- und
+% \textbf{y}-Abstand zum Seitenursprung. Die Angaben müssen als
+% vielfaches von \textbf{1pt} angegeben werden.
+%
+% In der \textbf{schwalbe-class} kann das Lineal durch die Option
+% \textbf{ruler} aktiviert werden:
+%
+% \begin{verbatim}
+% \documentclass[ruler]{schwalbe}
+% \end{verbatim}
+%
+% Mit aktivierter \textbf{ruler}-Option kann das Anzeigen des Lineals
+% durch Anlegen einer Datei \verb+__finalpdf__.tex+ deaktiviert
+% werden. Das habe ich in dem Prozess, der die Schwalbe-Hefte baut,
+% automatisiert.
+%
+% Der Code zur Erzeugung des Lineals ist eine eigene Style-Datei
+% \verb+swruler.sty+ ausgelagert, so dass man das Lineal ohne
+% \textbf{schwalbe-class} verwenden kann.
+%
% \DescribeEnv{MeasureMode}
% \DescribeMacro{\MeasureNewpage}
-% Um den Umfang der einzelnen Artikel einfacher Abschätzen zu können,
-% füge ich vor jedem Artikel den Befehl \verb+\MeasureNewpage+ ein,
-% der ein \verb+\newpage+ durchführt, wenn der Boolean
-% \verb+MeasureMode+ gleich \verb+true+ ist.
+% Außerdem füge ich vor jedem Artikel den Befehl
+% \verb+\MeasureNewpage+ ein, der ein \verb+\newpage+ durchführt, wenn
+% der Boolean \verb+MeasureMode+ gleich \verb+true+ ist.
%
% \StopEventually{\PrintIndex\PrintChanges}
%
@@ -470,9 +511,15 @@
% \begin{macrocode}
%<*class>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{schwalbe}[2022/05/28]
+\ProvidesClass{schwalbe}[2022/06/23]
+\DeclareOption{ruler}{%
+ \AtBeginDocument{\IfFileExists{__finalpdf__.tex}{}{%
+ \ShowRuler{32mm / 1pt}{-44mm / 1pt}}}
+}%
+\ProcessOptions\relax%
\LoadClass[11pt,a4paper]{article}
-\RequirePackage[12pt]{schwalbe}[2019/12/28]
+\RequirePackage[12pt]{schwalbe}[2022/06/23]
+\RequirePackage{swruler}[2022/06/19]
\RequirePackage{cpdparse}[2020/12/27]
\RequirePackage[T2A,T1]{fontenc}% fsRUS 140121
\RequirePackage[koi8-r,utf8]{inputenc}% fsRUS 140121
@@ -533,6 +580,8 @@
\def\zB{z.\,B.\ignorespaces}
\def\su{s.\,u.\ignorespaces}
\def\ep{e.\,p.\ignorespaces}
+\def\win{$\pm$}
+\def\loose{$\mp$}
\def\seedia{s.\,Diagr.}
%
%-----------------------------------------------------------
@@ -590,11 +639,13 @@
% Band, Heftnummer, Monat, Jahr und erste Seitennummer des Heftes
% spezifiziert.
% \begin{macrocode}
+\newcounter{sw@volume}%
\newcounter{sw@issue}%
\newcounter{sw@month}%
\newcounter{sw@year}%
\newcommand{\Heft}[5]{%
\def\heft@band{#1}%
+ \setcounter{sw@volume}{#1}%
\setcounter{sw@issue}{#2}%
\setcounter{sw@month}{#3}%
\setcounter{sw@year}{#4}%
@@ -604,7 +655,7 @@
{\large\bfseries%
HEFT~#2%
\hfill%
- BAND #1%
+ BAND \Roman{sw@volume}%
\hfill%
\sw@monat{\value{sw@month}}~#4%
}%
@@ -693,9 +744,9 @@
, S.~\the\pages@tk%
\fi%
\else%
- \if@special\relax%
+ \ifthenelse{\boolean{@cpd@numbering@local}}{}{%
\thediag%
- \fi
+ }%
\fi\fi%
\egroup%
}
@@ -980,7 +1031,7 @@
\AtEndDocument{\immediate\closeout\@cpdfile@loeserkuerzel}
\newcommand{\x@cpd@saveloeser}[2]{%
- \immediate\write\@cpdfile@loeserkuerzel{\unexpanded{#1:#2}}
+ \immediate\write\@cpdfile@loeserkuerzel{\unexpanded{#1:#2}}%
}
\newcommand{\y@cpd@saveloeser}[2]{%
\x@cpd@saveloeser{#1}{#2}%
@@ -1040,11 +1091,11 @@
}
\newcommand{\showsol}{}
\newcommand{\cpd@Loesung}[3]{%
- \textbf{#1}\ \sw@loesung@authors{#2}%
+ \textbf{#1}\ \sw@loesung@authors{#2}.\ %
\renewcommand{\showsol}{#3}%
}
\newcommand{\cpd@Loesung@star}[3]{%
- \textbf{#1}\ \sw@loesung@authors{#2}\ #3%
+ \textbf{#1}\ \sw@loesung@authors{#2}.\ #3.%
\renewcommand{\showsol}{}%
}
\newcommand{\Loesung}{%
@@ -1954,48 +2005,7 @@
\newcommand{\mal}{\mbox{\ifmmode\times\else$\times$\fi}}
% \end{macrocode}
%
-% Das Makro \verb+\Ruler+ erzeugt ein Lineal mit einer $1/20$
-% Einteilung der Seitenhöhe.
-%
-% \begin{macrocode}
-\newcommand{\Ruler}{%
-\makebox{%
-\setlength{\unitlength}{13mm}
-\begin{picture}(1,20)
-\put(0.4,-20){\line(0,1){20}}
-
-\multiput(0.4,-20)(0,2){11}{\line(1,0){0.4}}
-\multiput(0.4,-19)(0,2){10}{\line(1,0){0.2}}
-\put(0,-20){10}
-\put(0,-18){9}
-\put(0,-16){8}
-\put(0,-14){7}
-\put(0,-12){6}
-\put(0,-10){5}
-\put(0,-8){4}
-\put(0,-6){3}
-\put(0,-4){2}
-\put(0,-2){1}
-\end{picture}
-}}% Ruler
-% \end{macrocode}
-%
-% Das Makro \verb+\ShowRuler+ sorgt dafür, dass das mittels
-% \verb+\Ruler+ erzeugte Lineal auf jeder Seite angezeigt wird.
-%
-% \begin{macrocode}
-\newcommand{\ShowRuler}{%
-\AddToHook{shipout/background}{\put(32mm,-46mm){\Ruler}}%
-}%
-% \end{macrocode}
-%
-% Wenn beim Übersetzen der \LaTeX-Datei in aktuellen Verzeichnis keine
-% \verb+__finalpdf__.tex+ existiert, wird die Anzeige des
-% Lineals mittels \verb+\ShowRuler+ aktiviert. Durch Anlegen der Datei
-% kann das Einblenden des Lineals deaktiviert werden.
-%
% \begin{macrocode}
-\AtBeginDocument{\IfFileExists{__finalpdf__.tex}{}{\ShowRuler}}
\newboolean{MeasureMode}
\setboolean{MeasureMode}{false}
@@ -2012,7 +2022,7 @@
% \begin{macrocode}
%<*style>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{schwalbe}[2019/12/28]
+\ProvidesPackage{schwalbe}[2022/06/23]
% \end{macrocode}
%
% Der \textit{Schwalbe-Style} ist eine Erweiterung des
@@ -2027,7 +2037,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{diagram}[2020/02/09]
+\RequirePackage{diagram}[2022/06/19]
%
%
% Wir definieren das Diagrammlayout ein wenig um.
@@ -2095,11 +2105,9 @@
\def\@dia@number{}% Die Diagrammnummer wird bei den Autoren gesetzt!
%
\def\@dia@numberx{%
- \if@special%
- \thediag%
- \else\ifdi@no%
- \thediag%
- \fi\fi%
+ \ifthenelse{\boolean{@cpd@numbering@local}}{%
+ {\authorfont\thediag}%
+ }{}%
}
%
\def\@dia@authors{%
@@ -2111,8 +2119,10 @@
\let\@action=\@dia@writename% Parse the list of authors
\@parseTokenlist\aut@tk;%
\else%
- \above@newline
- {\authorfont\@dia@numberx}%
+ \ifthenelse{\boolean{@cpd@numbering@local}}{%
+ \above@newline%
+ \@dia@numberx%
+ }{}%
\fi%
}
%
@@ -2156,20 +2166,83 @@
\newlength{\double@boardwidth}%
\def\doublediagram#1{%
- \def\dia@above{\if@special\else%
- \setlength{\helplength}{\textwidth}%
- \addtolength{\helplength}{-3\board@width}%
- \setlength{\boardskip}{.5\helplength}%
- \setlength{\double@boardwidth}{2\board@width}%
- \addtolength{\double@boardwidth}{\boardskip}%
- \begin{minipage}[b]{\double@boardwidth}%
- #1%
- \end{minipage}%
- \fi}%
+ \def\dia@above{%
+ \ifthenelse{@cpd@numbering@local}{}{%
+ % \if@special\else%
+ \setlength{\helplength}{\textwidth}%
+ \addtolength{\helplength}{-3\board@width}%
+ \setlength{\boardskip}{.5\helplength}%
+ \setlength{\double@boardwidth}{2\board@width}%
+ \addtolength{\double@boardwidth}{\boardskip}%
+ \begin{minipage}[b]{\double@boardwidth}%
+ #1%
+ \end{minipage}%
+ % \fi
+ }%
+ }%
}
%</style>
% \end{macrocode}
%
+% \section{Die Implementierung des \textbf{swruler.sty}}
+%
+% \begin{macrocode}
+%<*rulerstyle>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{swruler}[2022/06/19]
+\RequirePackage{calc}
+% \end{macrocode}
+%
+% Das Makro \verb+\Ruler+ erzeugt ein Lineal mit einer $1/20$
+% Einteilung der Seitenhöhe.
+%
+% \begin{macrocode}
+\newcommand{\Ruler}{%
+\makebox{%
+\setlength{\unitlength}{\textheight / 20}
+\begin{picture}(1,20)
+\put(0.4,-20){\line(0,1){20}}
+\multiput(0.4,-20)(0,2){11}{\line(1,0){0.4}}
+\multiput(0.4,-19)(0,2){10}{\line(1,0){0.2}}
+\put(0,-20){10}
+\put(0,-18){9}
+\put(0,-16){8}
+\put(0,-14){7}
+\put(0,-12){6}
+\put(0,-10){5}
+\put(0,-8){4}
+\put(0,-6){3}
+\put(0,-4){2}
+\put(0,-2){1}
+\end{picture}
+}}% Ruler
+% \end{macrocode}
+%
+%
+% Das Makro \verb+\ShowRuler+ sorgt dafür, dass das mittels
+% \verb+\Ruler+ erzeugte Lineal auf jeder Seite angezeigt wird.
+% Da in älteren \LaTeX-Versionen das Kommando \verb+\AddToHook+ noch
+% nicht existiert, wird in diesem Fall eine Warnung ausgegeben. Ein
+% Lineal kann dann nicht angezeigt werden.
+%
+% \begin{macrocode}
+\providecommand{\AddToHook}[2]{%
+\message{^^JWARNING: Your LaTeX is too old to activate a Ruler on each page.^^J}%
+}%
+\newcommand{\ShowRuler}[2]{%
+\AddToHook{shipout/background}{\put(#1,#2){\Ruler}}%
+}%
+% \end{macrocode}
+%
+% Wenn beim Übersetzen der \LaTeX-Datei in aktuellen Verzeichnis keine
+% \verb+__finalpdf__.tex+ existiert, wird die Anzeige des
+% Lineals mittels \verb+\ShowRuler+ aktiviert. Durch Anlegen der Datei
+% kann das Einblenden des Lineals deaktiviert werden.
+%
+% \begin{macrocode}
+%</rulerstyle>
+% \end{macrocode}
+%
% \Finale
diff --git a/macros/latex/contrib/schwalbe-chess/schwalbe.ins b/macros/latex/contrib/schwalbe-chess/schwalbe.ins
index bbea30d9b0..a7641a3c45 100644
--- a/macros/latex/contrib/schwalbe-chess/schwalbe.ins
+++ b/macros/latex/contrib/schwalbe-chess/schwalbe.ins
@@ -3,5 +3,6 @@
\generate{%
\file{schwalbe.sty}{\from{schwalbe.dtx}{style}}%
\file{schwalbe.cls}{\from{schwalbe.dtx}{class}}%
+ \file{swruler.sty}{\from{schwalbe.dtx}{rulerstyle}}%
}
\endbatchfile
diff --git a/macros/latex/contrib/schwalbe-chess/schwalbe.pdf b/macros/latex/contrib/schwalbe-chess/schwalbe.pdf
index bc3f10ddba..35ec9985a3 100644
--- a/macros/latex/contrib/schwalbe-chess/schwalbe.pdf
+++ b/macros/latex/contrib/schwalbe-chess/schwalbe.pdf
Binary files differ