summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-03-20 20:31:17 +0000
committerKarl Berry <karl@freefriends.org>2023-03-20 20:31:17 +0000
commit3135bbd1c28aea5d99d9fd81316b445fcbaa60d3 (patch)
treef460c66b24f4dd970e4e521edcec0359c275b6f0 /Master/texmf-dist/tex/latex/biblatex-apa
parente386871483440be4dbf0297933bd53f3ad9a4a7e (diff)
biblatex-apa (20mar23)
git-svn-id: svn://tug.org/texlive/trunk@66605 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx24
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx15
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.lua38
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx126
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx40
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx248
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx53
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx8
32 files changed, 550 insertions, 182 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index ad5493e2646..cfba46c473a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{american}
\NewBibliographyString{publication}
@@ -287,7 +287,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -315,7 +315,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -361,7 +361,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index ee19f6dd0a4..345ee1b5f60 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2022/06/22\space v9.16\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2023/03/20\space v9.17\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{same} % APA examples all have URLs in same font as text
@@ -177,6 +177,7 @@
{\printtext{%
\mkbibdateapalong{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
+ \dateuncertainprint
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
@@ -191,7 +192,7 @@
{\mkbibdateapalong{}{}{#1endmonth}{#1endday}}}%
{\mkbibdateapalong{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}%
\dateeraprint{#1endyear}}}
- {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
+ {\addslash\mkbibdateapalong{}{#1endyeardivision}{}{}}}%
\enddateuncertainprint}}}}%
\endgroup}
@@ -306,6 +307,10 @@
}
}
+% Don't sort on EDITOR for INBOOK (IN* since IN* is mapped to INBOOK) as TITLE is used in place of author
+% if there is no AUTHOR
+\DeclareSortExclusion{inbook}{editor}
+
\DeclareLabelname{%
\field{shortauthor}
\field{author}
@@ -313,6 +318,13 @@
\field{editor}
}
+% Don't use EDITOR as labelname in INBOOK (IN* since IN* is mapped to INBOOK) as citations should be
+% via TITLE if there is no AUTHOR
+\DeclareLabelname[inbook]{%
+ \field{shortauthor}
+ \field{author}
+}
+
% Don't fall back on other year fields if there is no year, use
% "nodate" string
\DeclareLabeldate{%
@@ -620,7 +632,7 @@
\renewbibmacro*{author/editor}{%
\ifnameundef{author}
- {\ifnameundef{editor}
+ {\ifthenelse{\ifnameundef{editor}\OR\ifentrytype{inbook}}
{\usebibmacro{title}%
% need to clear all title fields so we don't get them again later
\clearfield{title}%
@@ -636,7 +648,7 @@
\newbibmacro*{author/editor:related}{%
\ifnameundef{author}
- {\ifnameundef{editor}
+ {\ifthenelse{\ifnameundef{editor}\OR\ifentrytype{inbook}}
{\usebibmacro{title}%
% need to clear all title fields so we don't get them again later
\clearfield{title}%
@@ -1538,7 +1550,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit{\printdelim{nametitledelim}}\newblock
+ \printdelim{nametitledelim}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
\usebibmacro{apa:related}%
@@ -2005,7 +2017,7 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \usebibmacro{location+publisher}%
+ \printlist{publisher}%
\newunit\newblock
\usebibmacro{doi+url}%
\newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 591fa50aea7..e588ef7eba3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2022/06/22\space v9.16\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2023/03/20\space v9.17\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -258,7 +258,7 @@
% (APA 11) Bizarre and special rules for legal information
\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat[book,manual,report,preiodical,legmaterial,jurisdiction]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[book,manual,report,periodical,legmaterial,jurisdiction,video]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[legislation,legadminmaterial,legal]{citetitle}{#1}
\newbibmacro*{cite:noname}{%
@@ -507,7 +507,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 8.11) No parens round year for cites when the cite is in
-% parentheses. Use new command \nptextcite for such cites.
+% parentheses. Use new command \nptextcite for such cites
+% unless using luatex which does it automatically
\DeclareDelimAlias[nptextcite]{finalnamedelim}[parencite]{finalnamedelim}
@@ -620,4 +621,12 @@
\let\cbx@textcites@init\cbx@textcite@init
\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+\ifdef\luatexversion
+ {\directlua{require'apa'}%
+ \glet\textcitei\textcite
+ \glet\parencitei\parencite
+ \gdef\textcite{\BLTXAPAifInParensTF{\nptextcite}{\textcitei}}%
+ \gdef\parencite{\BLTXAPAifInParensTF{\nptextcite}{\parencitei}}}
+ {}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index dc81deefca1..1563fa843c7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2022/06/22\space v9.16\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2023/03/20\space v9.17\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua b/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua
new file mode 100644
index 00000000000..7b786341f11
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua
@@ -0,0 +1,38 @@
+-- From Marcel Krüger's answer at https://tex.stackexchange.com/a/654261/80496
+
+-- How to translate boolean results to TeX macros selecting the right arguments
+local bool_to_token = {[false] = token.create'use_ii:nn', [true] = token.create'use_i:nn'}
+
+-- The codepoints we have to look for
+local left_paren = string.byte'('
+local right_paren = string.byte')'
+
+-- Some boilerplate to define an unexpandable command sequence from Lua
+local id = luatexbase.new_luafunction'BLTXAPAifInParensTF'
+token.set_lua('BLTXAPAifInParensTF', id, 'protected')
+lua.get_functions_table()[id] = function()
+
+ -- We want to look at the current list
+ local head = tex.nest.top.head
+
+ local level = 0
+ -- and look at all unprocessed characters
+ for _, char in node.traverse_char(head) do
+ -- Track the nesting level
+ if char == left_paren then
+ level = level + 1
+ elseif char == right_paren then
+ if level > 0 then
+ level = level - 1
+ else
+ -- Negative levels don't make sense, so we ignore the ) instead. Print a warning though to avoid surprises.
+ luatexbase.module_warning('biblatex-apa', '\z
+ Unable to reliably determine if inside parentheses\z
+ since the paragraphs contains an unmatched `)` - will be ignored\z
+ ')
+ end
+ end
+ end
+ -- Finally insert a macro which will select the first or second argument dependingon whether level > 0
+ token.put_next(bool_to_token[level > 0])
+end
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index b511a99e173..ec0c88b4129 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
@@ -286,7 +286,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +314,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
index 2cdaf9e3417..99cfd9a0f18 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
\NewBibliographyString{publication}
@@ -157,7 +157,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -185,7 +185,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -231,7 +231,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index 95546c2df06..8cfec9d5e0f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{british}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -189,7 +189,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -235,7 +235,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
index 877dc0e9810..d42c83a67bb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{catalan-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{catalan-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
% Translation based on:
% spanish-apa.lbx file (for source to translate from)
@@ -180,7 +180,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -208,7 +208,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
index 46abe45d0cd..20ee8a5be82 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
\NewBibliographyString{publication}
@@ -67,65 +67,65 @@
\DeclareBibliographyStrings{%
inherit = {danish},
-% jourarticle = {{article}{article}},%FIXME
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
-% 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 = {{producer}{producer}},%FIXME
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{producent}{producent}},
-% 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
+ jourarticle = {{artikel}{artikel}},
+ tothe = {{til}{til}},%FIXME - I am unsure of the context in which this would appear
+ ofthe = {{af}{af}},%FIXME - I am unsure of the context in which this would appear
+ unitednations = {{Forenede\space Nationer}{FN}},
+ charter = {{pagt}{pagt}},
+ article = {{artikel}{art\adddot}},
+ painting = {{maleri}{maleri}},
+ present = {{pr{\ae}sentation}{pr{\ae}sent\adddot}},
+ song = {{sang}{sang}},
+ album = {{album}{album}},
+ map = {{landkort}{landkort}},
+ photograph = {{fotografi}{fotografi}},
+ photographs = {{fotografier}{fotografier}},
+ powerpoint = {{PowerPoint-slides}{PowerPoint-slides}},
+ lecturenotes = {{forel{\ae}sningsnoter}{forel{\ae}sningsnoter}},
+ podcast = {{podcast}{podcast}},
+ podcastepisode = {{podcastafsnit}{podcastafsnit}},
+ interview = {{interview}{interv\adddot}},
+ speech = {{tale}{tale}},
+ lithograph = {{litografi}{litgr\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{tv-serie}{tv-serie}},
+ tvepisode = {{tv-serie-afsnit}{tv-serie-afsnit}},
+ narrator = {{indtaler}{indt\adddot}},
+ narrators = {{indtalere}{indt\adddot}},
+ producer = {{producer}{producer}},
+ producers = {{producere}{producere}},
+ execproducer = {{ledende\space producer}{led\addot\space prod\adddot}},
+ execproducers = {{ledende\space producere}{led\adddotspace prod\adddot}},
+ execdirector = {{ledende\space instrukt{\o}r}{led\adddotspace instr\adddot}},
+ execdirectors = {{ledende\space instrukt{\o}rer}{led\adddotspace instr\adddot}},
director = {{instrukt{\o}r}{instr\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{manuskript}{manuskript}},
-% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
-% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
-% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ directors = {{instrukt{\o}rer}{instr\adddot}},
+ writer = {{manuskriptforfatter}{manuskriptforf\adddot}},
+ writers = {{manuskriptforfattere}{manuskriptforf\adddot}},
+ host = {{v{\ae}rt}{v{\ae}rt}},
+ hosts = {{v{\ae}rter}{v{\ae}rter}},
+ guestexpert = {{g{\ae}steekspert}{g{\ae}steeksp\adddot}},
+ guestexperts = {{g{\ae}steeksperter}{g{\ae}steeksp\adddot}},
with = {{med}{med}},
-% 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
-% part = {{part}{pt\adddot}},%FIXME
+ manunpub = {{upubliceret}{upubl\adddot}},
+ maninprep = {{under\space udarbejdelse}{under\space udarbejdelse}},%similar to standard biblatex "inpreparation" translation in danish.lbx
+ mansub = {{indsendt\space til\space bed{\o}mmelse}{indsendt\space til\space bed{\o}mmelse}},
+ supplement = {{supplement}{suppl\adddot}},
+ part = {{del}{del}},
revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
-% commenton = {{comment\space on}{comment\space on}},%FIXME
+ commenton = {{kommentar\space p{\aa}}{kommentar\space p{aa}}},% in the context: <comment on the blog post 'xxx'>
page = {{side}{{}s\adddot}},
- pages = {{sider}{{}s\adddot}},
+ pages = {{side}{{}s\adddot}},% in the context <side (s.) 16–17>, English: <pages (pp.) 16–17>. Not plural in Danish.
on = {{p{\aa}}{p{\aa}}},
retrieved = {{hentet}{hentet}},
- available = {{tilgængelig}{tilgængelig}},
+ available = {{tilg{\ae}ngelig}{tilg{\ae}ngelig}},
from = {{fra}{fra}},
archivedat = {{arkiveret\space ved}{arkiveret\space ved}},
reviewof = {{anmeldelse\space af}{anmeldelse\space af}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
- january = {{januar}{januar}},
+ paragraph = {{afsnit}{afs\adddot}},
+ paragraphs = {{afsnit}{afs\adddot}},
+ january = {{januar}{januar}},%APA does not like abbreviating months, which the standard biblatex.lbx files do. Thus the months are duplicated here.
february = {{februar}{februar}},
march = {{marts}{marts}},
april = {{april}{april}},
@@ -137,22 +137,22 @@
october = {{oktober}{oktober}},
november = {{november}{november}},
december = {{december}{december}},
- mathesis = {{Speciale}{Speciale}},
- phdthesis = {{Ph.d.-afhandling}{Ph.d.-afhandling}},
- origyear = {{oprindeligt\space offentliggjort}{oprindeligt\space offentliggjort}},
+% mathesis = {{Kandidatspeciale}{Kandidatspeciale}},%not necessary as this translation is already provided from the standard biblatex danish.lbx repo
+% phdthesis = {{PhD-afhandling}{PhD-afhandling}},%not necessary as this translation is already provided from the standard biblatex danish.lbx repo
+ origyear = {{oprindeligt\space offentliggjort}{opr\adddotspace off\adddot}},
typechair = {{ordstyrer}{ordstyrer}},
typechairs = {{ordstyrere}{ordstyrere}},
- typevolume = {{bindredakt{\o}r}{bindred\adddot}},
- typevolumes = {{bindredakt{\o}rer}{bindred\adddot}},
+ typevolume = {{bindredakt{\o}r}{bindred\adddot}},%or 'symposiumredakt{\o}r'
+ typevolumes = {{bindredakt{\o}rer}{bindred\adddot}},%or 'symposiumredakt{\o}r'
typeseries = {{serieredakt{\o}r}{seriered\adddot}},
typeseriess = {{serieredakt{\o}rer}{seriered\adddot}},
typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
-% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
-% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
-% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
-% publication = {{Publication}{Publication}}
+ annodomini = {{e\adddot v\adddot t\adddot}{e\adddot v\adddot t\adddot}},%e.v.t. to keep it religiously neutral
+ beforechrist = {{f\adddot v\adddot t\adddot}{f\adddot v\adddot t\adddot}},%f.v.t. to keep it religiously neutral
+ commonera = {{v\adddot t\adddot}{v\adddot t\adddot}},%vor tidsregning, not applicable in Danish
+ beforecommonera = {{f\adddot v\adddot t\adddot}{f\adddot v\adddot t\adddot}},
+ publication = {{publikation}{publikation}}
}
%
@@ -173,7 +173,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -203,7 +203,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index 36e54273ed1..f90104c7770 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -189,7 +189,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -235,7 +235,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index e407b5bcb6a..e406678e40a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{english}
\NewBibliographyString{publication}
@@ -163,7 +163,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -191,7 +191,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -237,7 +237,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
index 0e2559833fc..4f0221ba050 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{finnish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{finnish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
% Translations based on:
% https://libguides.oulu.fi/tieteellinentiedonhankinta/apa
@@ -169,7 +169,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -197,7 +197,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -243,7 +243,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index 62e628684d0..3cf25711f56 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{french}
\NewBibliographyString{publication}
@@ -156,7 +156,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -184,7 +184,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -230,7 +230,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
index 0d9a6166542..31abdc327db 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -173,7 +173,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -201,7 +201,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -247,7 +247,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index c0439527cc7..7259117e70a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
@@ -275,7 +275,39 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \renewcommand{\apashortdash}{~}%
+ \renewcommand*{\mkdaterangeapalongextra}[1]{%
+ \begingroup
+ \blx@metadateinfo{#1}%
+ \iffieldundef{#1year}{}
+ {\printtext[#1date]{%
+ \datecircaprint
+ \ifboolexpr{ test {\iffieldsequal{#1year}{#1endyear}}
+ and test {\iffieldsequal{#1month}{#1endmonth}}}
+ {\iffieldundef{#1endday}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{}{#1day}%
+ \bibdatedash%
+ \mkbibdateapalongextra{}{}{#1month}{#1endday}}}%
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}%
+ \dateeraprint{#1year}%
+ \dateuncertainprint%
+ \ifboolexpr{ not test {\iffieldundef{#1endyear}}
+ and (not test {\iffieldsequal{#1year}{#1endyear}}
+ or not test {\iffieldsequal{#1month}{#1endmonth}})}
+ {\bibdatedash
+ \iffieldequalstr{#1endyear}% open-ended range?
+ {}
+ {\bibstring{present}}}
+ {}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\iffieldsequal{#1month}{#1endmonth}
+ {}
+ {\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}%
+ \dateeraprint{#1endyear}%
+ \enddateuncertainprint}%
+ \endgroup}}%
+\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
@@ -286,7 +318,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +346,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index 55deff23cee..fc541af4fd7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
\NewBibliographyString{publication}
@@ -179,7 +179,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -207,7 +207,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -253,7 +253,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx
new file mode 100644
index 00000000000..de5d7d6e691
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx
@@ -0,0 +1,248 @@
+\ProvidesFile{hungarian-apa.lbx}[2022/07/25\space APA biblatex localisation - Hungarian]
+\InheritBibliographyExtras{hungarian}
+
+\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}
+
+\DeclareBibliographyStrings{%
+ inherit = {hungarian},
+ % deviations from biblatex.lbx
+ andothers = {{\'es munkat\'arsai}{\'es mtsai\adddot}},
+ % continuation of ~-apa.lbx
+ jourarticle = {{foly\'oirat cikk}{cikk}},
+% tothe = {{to\space the}{to\space the}}, % need example
+% ofthe = {{of\space the}{of\space the}}, % need example
+ unitednations = {{Egyes\"ult\space Nemzetek\space Szervezete}{ENSZ}},
+ charter = {{okirat}{okirat}},
+ article = {{\'ujs\'agcikk}{\'ujs\'agcikk}},
+ painting = {{festm\'eny}{festm\'eny}},
+ present = {{jelenkor}{jelen}},
+ song = {{dal}{dal}},
+ album = {{album}{album}},
+ map = {{t\'erk\'ep}{t\'erk\'ep}},
+ photograph = {{f\'enyk\'ep}{f\'enyk\'ep}},
+ photographs = {{f\'enyk\'epek}{f\'enyk\'epek}},
+ powerpoint = {{Powerpoint\space dia}{Powerpoint\space dia}},
+ lecturenotes = {{el\H{o}adas jegyzet}{jegyzet}},
+ podcast = {{podcast}{podcast}},
+ podcastepisode = {{podcast\space epiz\'od}{podcast\space ep\adddot}},
+ interview = {{interj\'u}{interj\'u}},
+ speech = {{hangfelv\'etel}{hangfelv\adddot}},
+ lithograph = {{k\H{o}nyomat}{k\H{o}nyomat}},
+ video = {{vide\'o}{vide\'o}},
+ film = {{film}{film}},
+ tvseries = {{t\'elev\'izi\'os\space sorozat}{t\'ev\'esorozat}},
+ tvepisode = {{t\'elev\'izi\'ossorozat-epiz\'od}{t\'ev\'esorozat-epiz\'od}},
+ narrator = {{narr\'ator}{narr\adddot}},
+ narrators = {{narr\'ator}{narr\adddot}},
+ producer = {{gy\'art\'svezet\H{o}}{producer}},
+ producers = {{gy\'art\'svezet\H{o}k}{producerek}},
+ execproducer = {{f\H{o}gy\'art\'svezet\H{o}}{f\H{o}gy\'art\'svezet\H{o}}},
+ execproducers = {{f\H{o}gy\'art\'svezet\H{o}k}{f\H{o}gy\'art\'svezet\H{o}k}},
+ execdirector = {{\"ugyvezet\H{o}\space igazgat\'o}{\"ugyv\adddotspace ig\adddot}},
+ execdirectors = {{\"ugyvezet\H{o}\space igazgat\'ok}{\"ugyv\adddotspace ig\adddot}},
+ director = {{igazgat\'o}{ig\adddot}},
+ directors = {{igazgat\'ok}{ig\adddot}},
+ writer = {{\'ir\'o}{\'ir\'o}},
+ writers = {{\'ir\'ok}{\'ir\'ok}},
+ host = {{m\H{u}sorvezet\H{o}}{m\H{u}sorvez\adddot}},
+ hosts = {{m\H{u}sorvezet\H{o}k}{m\H{u}sorvez\adddot}},
+ guestexpert = {{vend\'egszak\'ert\H{o}}{vend\'egszak\'ert\H{o}}},
+ guestexperts = {{vend\'egszak\'ert\H{o}k}{vend\'egszak\'ert\H{o}k}},
+ % with = {{with}{with}}, % in Hungarian syntax might be "and" unless order is changed since agglutinative
+ manunpub = {{kiadatlan\space k\'ezirat}{kiadatlan\space k\'ezirat}},
+ maninprep = {{k\'ezirat\space szerkeszt\'es\space alatt}{k\'ezirat\space szerkeszt\'es\space alatt}},
+ mansub = {{k\'ezirat\space kiad\'as\space alatt}{k\'ezirat\space kiad\'as\space alatt}},
+ supplement = {{p\'otk\"otet}{p\'otk\"otet}},
+ part = {{r\'esz}{r\adddot}},
+ revisededition = {{\'atdolgozott\space kiad\'as}{\'atdolg.\adddotspace kiad\adddot}},
+ % commenton = {{comment\space on}{comment\space on}}, % need example
+ page = {{oldal}{{}o\adddot}},
+ pages = {{oldal}{{}o\adddot}},
+ % on = {{on}{on}}, % FIXME example needed, also word order
+ % retrieved = {{retrieved}{retrieved}},
+ % available = {{available}{available}},
+ % from = {{from}{from}}, % FIXME example needed, also word order
+ archivedat = {{archiv\'al\'as\space ideje}{arch\adddotspace id\adddot}},
+ reprintas = {{ut\'annyom\'as\space c\'ime}{ut\'anny\adddotspace c\'ime}},
+ reprintfrom = {{ut\'annyom\'as\space forr\'asa}{ut\'anny\adddotspace forr\'asa}},
+ reviewof = {{recenz\'alt\space m\H{u}}{recenz\'alt\space m\H{u}}},
+ paragraph = {{bekezd\'es}{bek\adddot}},
+ paragraphs = {{bekezd\'es}{bek\adddot}},
+ mathesis = {{szakdolgozat}{szakdolg\adddot}},
+ phdthesis = {{doktori\space disszert\'aci\'o}{disszert\adddot}},
+ origyear = {{eredeti\space kiad\'as\space ideje}{eredetileg\space kiadva}},
+ typechair = {{tansz\'ekvezet\H{o}}{tansz\'ekv\adddot}},
+ typechairs = {{tansz\'ekvezet\H{o}}{tansz\'ekv\adddot}},
+ typevolume = {{k\"otetszerkeszt\H{o}}{k\"otetszerk\adddot}},
+ typevolumes = {{k\"otetszerkeszt\H{o}k}{k\"otetszerk\adddot}},
+ typeseries = {{sorozatszerkeszt\H{o}}{sorozatszerk\adddot}},
+ typeseriess = {{sorozatszerkeszt\H{o}k}{sorozatszerk\adddot}},
+ typevolseries = {{sorozat-\space \'es\space k\"otetszerkeszt\H{o}}{sor\adddotspace \'es\space k\"otetszerk\adddot}},
+ typevolseriess = {{sorozat-\space \'es\space k\"otetszerkeszt\H{o}k}{sor\adddotspace \'es\space k\"otetszerk\adddot}},
+ annodomini = {{Kr\adddotspace u\adddot}{Kr\adddotspace u\adddot}},
+ beforechrist = {{Kr\adddotspace e\adddot}{Kr\adddotspace e\adddot}},
+ commonera = {{i\adddotspace sz\adddot}{i\adddotspace sz\adddot}},
+ beforecommonera = {{i\adddotspace e\adddot}{i\adddotspace e\adddot}},
+ publication = {{publik\'aci\'o}{publ\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}{\bibncpstring{\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}{\bibncpstring{\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}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index 19bad1de8ac..5ddd7dc869e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -189,7 +189,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -235,7 +235,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
index ec9190592ab..153ad9a06c0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
@@ -286,7 +286,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +314,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index a53119f8132..5438ed93d9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
@@ -131,7 +131,7 @@
\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)
+ inpress = {{im Druck}{im Druck}},
jourarticle = {{Artikel}{Artikel}},
tothe = {{zur}{zur}},
ofthe = {{der}{der}},
@@ -271,12 +271,39 @@
wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Drop end* when they are the same as *
-% You must use \printdate to get here otherwise it will be ignored
-
\DeclareBibliographyExtras{%
+ \renewcommand*{\mkdaterangeapalongextra}[1]{%
+ \begingroup
+ \blx@metadateinfo{#1}%
+ \iffieldundef{#1year}{}
+ {\printtext[#1date]{%
+ \datecircaprint
+ \ifboolexpr{ test {\iffieldsequal{#1year}{#1endyear}}
+ and test {\iffieldsequal{#1month}{#1endmonth}}}
+ {\iffieldundef{#1endday}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{}{#1day}%
+ \bibdatedash%
+ \mkbibdateapalongextra{}{}{#1month}{#1endday}}}%
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}%
+ \dateeraprint{#1year}%
+ \dateuncertainprint%
+ \ifboolexpr{ not test {\iffieldundef{#1endyear}}
+ and (not test {\iffieldsequal{#1year}{#1endyear}}
+ or not test {\iffieldsequal{#1month}{#1endmonth}})}
+ {\bibdatedash
+ \iffieldequalstr{#1endyear}% open-ended range?
+ {}
+ {\bibstring{present}}}
+ {}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\iffieldsequal{#1month}{#1endmonth}
+ {}
+ {\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}%
+ \dateeraprint{#1endyear}%
+ \enddateuncertainprint}%
+ \endgroup}}%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3#4{%
@@ -288,7 +315,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -316,7 +343,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -364,10 +391,10 @@
{\addspace}%
\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
-\UndeclareBibliographyExtras{%
- \restorecommand\mkdaterangeapalong
- \restorecommand\mkdaterangeapalongextra
-}
+% \UndeclareBibliographyExtras{%
+% \restorecommand\mkdaterangeapalong
+% \restorecommand\mkdaterangeapalongextra
+% }
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
index 0f413b1a649..ea5db3afe73 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
\NewBibliographyString{publication}
@@ -122,7 +122,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -152,7 +152,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -200,7 +200,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
index dfb908e1424..cbcb7ee005d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
\NewBibliographyString{publication}
@@ -160,7 +160,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -190,7 +190,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -238,7 +238,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
index fb8861e044b..dc96e2534d9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
@@ -1,10 +1,11 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2023/03/20\space v9.17\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{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -177,7 +178,7 @@
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}}
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
@@ -189,6 +190,7 @@
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}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
% commenton = {{comment\space on}{comment\space on}},%FIXME
@@ -215,6 +217,7 @@
% 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}},
% publication = {{Publication}{Publication}},
alabama = {{Alabama}{{A\adddot L\adddot}}},
alaska = {{Alaska}{{A\adddot K\adddot}}},
@@ -285,7 +288,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -313,7 +316,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -366,7 +369,6 @@
\restorecommand\mkdaterangeapalongextra
}
-
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
index f0897caef96..f1f8c0ea28e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -191,7 +191,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -239,7 +239,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
index f8a48b2e1c4..6abe5c39e44 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
\NewBibliographyString{publication}
@@ -158,7 +158,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -186,7 +186,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -232,7 +232,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
index 77ee7f87c03..b82f3edb603 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
\NewBibliographyString{publication}
@@ -168,7 +168,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -198,7 +198,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -245,6 +245,6 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
index 1d37d34dd0f..6f15f71b615 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
\NewBibliographyString{publication}
@@ -196,7 +196,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -226,7 +226,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -274,7 +274,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index b4b1f2e7240..cfeaeaa1d15 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -173,7 +173,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -201,7 +201,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
index 95938c6a77d..64d8e764aaf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
\NewBibliographyString{publication}
@@ -158,7 +158,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -188,7 +188,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -236,6 +236,6 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
index 7a9b8015ddf..70b7e4b4c44 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
@@ -286,7 +286,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +314,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
index fae30835ebc..5540b769dd9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{turkish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{turkish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{turkish}
\NewBibliographyString{publication}
@@ -277,7 +277,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -305,7 +305,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -351,7 +351,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%