diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
22 files changed, 331 insertions, 110 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 2d9519b1a4f..085984bc963 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -66,7 +66,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{american}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index ac5e9c37500..4e52667c1f4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -1,4 +1,4 @@ -%% Copyright 2013 Philip Kime +%% Copyright 2016 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2015/01/23\space v6.7\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2016/03/01\space v6.8\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -360,13 +360,24 @@ \DeclareNameAlias{default}{apaauthor} \DeclareNameFormat{apaauthor}{% + \nameparts{#1}% \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} {\addcomma\addspace\ldots\addspace} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} {\iffieldequalstr{doubtfulauthor}{true} - {\mkbibbrackets{\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}?}} - {\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}}}}% + {\mkbibbrackets{\usebibmacro{name:apa:family-given}% + {\namepartfamily}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}?}} + {\usebibmacro{name:apa:family-given}% + {\namepartfamily}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}}}}% \ifthenelse{\value{listcount}=\value{listtotal}}% {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}} @@ -631,11 +642,17 @@ % (APA 7.02 Example 27) ... unless there is no author \DeclareNameFormat{apanames}{% + \nameparts{#1}% \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} {\addcomma\addspace\ldots} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} - {\usebibmacro{name:apa:first-last}{#1}{#3}{#4}{#5}{#7}}}% + {\usebibmacro{name:apa:given-family}% + {\namepartfamily}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}}}% \ifthenelse{\value{listcount}=\value{listtotal}}% {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}} @@ -676,53 +693,53 @@ % #4 = name prefix, a.k.a. 'von part' % #5 = name affix, a.k.a. 'junior part' -\newbibmacro*{name:apa:last-first}[5]{% +\newbibmacro*{name:apa:family-given}[5]{% \ifuseprefix {\usebibmacro{name:delim}{#4#1}% \usebibmacro{name:hook}{#4#1}% - \ifblank{#4}{}{% + \ifempty{#4}{}{% \mkbibnameprefix{#4}% \ifpunctmark{'}{}{\addhighpenspace}}% \mkbibnamelast{#1\isdot}% - \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot% + \ifempty{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot% \ifthenelse{\value{uniquename}>1} {\addspace\mkbibbrackets{#2}} {}}% - \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}} + \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% \mkbibnamelast{#1}\isdot - \ifblank{#2#4}{}{\addcomma}% - \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}% + \ifempty{#2#4}{}{\addcomma}% + \ifempty{#2}{}{\addlowpenspace\mkbibnamefirst{#3}% \ifthenelse{\value{uniquename}>1} {\addspace\mkbibbrackets{#2}} {}}% - \ifblank{#4}{}{% + \ifempty{#4}{}{% \addhighpenspace\mkbibnameprefix{#4}% \ifpunctmark{'}{}{\addhighpenspace}}% - \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} + \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} -\newbibmacro*{name:apa:first-last}[5]{% +\newbibmacro*{name:apa:given-family}[5]{% \ifuseprefix {\usebibmacro{name:delim}{#2}% \usebibmacro{name:hook}{#2}% - \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot% + \ifempty{#2}{}{\mkbibnamefirst{#3}\isdot% \ifthenelse{\value{uniquename}>1} {\addspace\mkbibbrackets{#2}} {}\addspace}% - \ifblank{#4}{}{% + \ifempty{#4}{}{% \mkbibnameprefix{#4\isdot}% \ifpunctmark{'}{}{\addhighpenspace}}% \mkbibnamelast{#1\isdot}% - \ifblank{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}} + \ifempty{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% - \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot% + \ifempty{#2}{}{\mkbibnamefirst{#3}\isdot% \ifthenelse{\value{uniquename}>1} {\addspace\mkbibbrackets{#2}} {}\addspace}% \mkbibnamelast{#1}\isdot - \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} + \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2055,7 +2072,7 @@ \DeclareFieldFormat{doi}{% doi\addcolon \ifhyperref - {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} + {\href{https://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} % APA 6th diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 1f6f4cfc5c7..f5c608ccb12 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -1,4 +1,4 @@ -%% Copyright 2013 Philip Kime +%% Copyright 2016 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.cbx}[2015/01/23\space v6.7\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2016/03/01\space v6.8\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -72,31 +72,22 @@ % (APA 6.12) 3-5 authors have "et al." after first cite % (Blog http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author -% #1 = last name -% #2 = last name (initials) -% #3 = first name -% #4 = first name (initials) -% #5 = name prefix, a.k.a. 'von part' -% #6 = name prefix (initials) -% #7 = name affix, a.k.a. 'junior part' -% #8 = name affix (initials) - \newbibmacro*{labelname:doname}[8]{% \ifnumcomp{\value{listcount}}{>}{1} {\setcounter{uniquename}{0}} {}% \ifcase\value{uniquename}% \ifuseprefix - {\usebibmacro{name:last}{#1}{#3}{#5}{}} - {\usebibmacro{name:last}{#1}{#3}{}{}}% + {\usebibmacro{name:family}{#1}{#3}{#5}{}} + {\usebibmacro{name:family}{#1}{#3}{}{}}% \or - \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#4}{#5}{}} - {\usebibmacro{name:first-last}{#1}{#4}{}{}}% + \ifuseprefix + {\usebibmacro{name:given-family}{#1}{#4}{#5}{}} + {\usebibmacro{name:given-family}{#1}{#4}{}{}}% \or - \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#3}{#5}{}} - {\usebibmacro{name:first-last}{#1}{#3}{}{}}% + \ifuseprefix + {\usebibmacro{name:given-family}{#1}{#3}{#5}{}} + {\usebibmacro{name:given-family}{#1}{#3}{}{}}% \fi \usebibmacro{name:andothers}} @@ -113,16 +104,33 @@ % all of the names in the list to work on here \DeclareNameFormat{labelname}{% + \nameparts{#1}% \ifthenelse{\value{uniquelist}>1} {\numdef\cbx@min{\value{uniquelist}}} {\numdef\cbx@min{\value{minnames}}}% \ifboolexpr{test {\ifnumcomp{\value{listcount}}{=}{1}} or test {\ifnumcomp{\value{listtotal}}{=}{2}}} - {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}} + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}} {\ifboolexpr{test {\ifnumcomp{\value{listtotal}}{>}{5}} or test {\ifciteseen}} {\ifnumcomp{\value{listcount}}{<}{\cbx@min + 1}% normal name - {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}% + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}} {}% \ifnumcomp{\value{listcount}}{=}{\cbx@min + 1}% first past ul is et al % but enforce plurality of et al - only truncate here if there is at @@ -130,12 +138,28 @@ % so that "et al" covers at least two elements. {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}} {\andothersdelim\bibstring{andothers}} - {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}% + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}} {}% \ifnumcomp{\value{listcount}}{>}{\cbx@min + 1}% nothing thereafter {\relax}% {}}% - {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}} + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -144,9 +168,27 @@ % (APA 6.13) Groups as names % SHORTAUTHOR brackets in parencites -\DeclareNameFormat{sabrackets}{\ifciteseen - {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}} - {\mkbibbrackets{\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}} +\DeclareNameFormat{sabrackets}{% + \nameparts{#1}% + \ifciteseen + {\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}} + {\mkbibbrackets{\usebibmacro{labelname:doname}% + {\namepartfamily}% + {\namepartfamilyi}% + {\namepartgiven}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartprefixi}% + {\namepartsuffix}% + {\namepartsuffixi}}}} \DeclareFieldFormat{shorthand}{\ifciteseen {#1} @@ -166,12 +208,12 @@ \def\citeresetapa{\global\let\cbx@apa@names\@empty} \citeresetapa \def\cbx@apa@ifnamesaved{% - \xifinlist{\thefield{namehash}}{\cbx@apa@names} + \xifinlist{\thefield{fullhash}}{\cbx@apa@names} {\@firstoftwo} {\@secondoftwo}} \newbibmacro*{cite:author}{% - \iffieldequals{namehash}{\cbx@lasthash} + \iffieldequals{fullhash}{\cbx@lasthash} % Multiple cites in one command {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}}% @@ -179,18 +221,27 @@ {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} % No author/editor {\usebibmacro{cite:noname}% - \savefield{namehash}{\cbx@lasthash}} + \savefield{fullhash}{\cbx@lasthash}} % Normal cite {\ifnameundef{shortauthor} {\printnames[labelname][-\value{listtotal}]{labelname}}% {\cbx@apa@ifnamesaved {\printnames{shortauthor}} {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{fullhash}{\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{namehash}{\cbx@lasthash} + \iffieldequals{fullhash}{\cbx@lasthash} % Multiple cites in one command {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}}% @@ -200,7 +251,7 @@ {\usebibmacro{cite:noname}% \setunit{\nameyeardelim}% \usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}} + \savefield{fullhash}{\cbx@lasthash}} % Normal cite {\ifnameundef{shortauthor} {\printnames[labelname][-\value{listtotal}]{labelname}}% @@ -209,11 +260,11 @@ {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% \setunit{\nameyeardelim}% \usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{fullhash}{\cbx@lasthash}}}% \setunit{\multicitedelim}} \newbibmacro*{textcite}{% - \iffieldequals{namehash}{\cbx@lasthash} + \iffieldequals{fullhash}{\cbx@lasthash} % Compact cite - more than one thing for same author {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}} @@ -256,7 +307,7 @@ % Actual year printing \usebibmacro{cite:plabelyear+extrayear}% % Save name hash for checks later - \savefield{namehash}{\cbx@lasthash}}}} + \savefield{fullhash}{\cbx@lasthash}}}} \newbibmacro*{cite:plabelyear+extrayear}{% \iffieldundef{labelyear} @@ -325,11 +376,11 @@ \newbibmacro*{citeyear}{% \iffieldundef{labelyear} {\usebibmacro{cite:init}} - {\iffieldequals{namehash}{\cbx@lasthash} + {\iffieldequals{fullhash}{\cbx@lasthash} {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}} {\usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{fullhash}{\cbx@lasthash}}}% \setunit{\multicitedelim}} % @@ -391,9 +442,9 @@ \global\undef\cbx@lasthash} \newbibmacro*{cite:post}{% - \xifinlist{\thefield{namehash}}{\cbx@apa@names} + \xifinlist{\thefield{fullhash}}{\cbx@apa@names} {} - {\listxadd{\cbx@apa@names}{\thefield{namehash}}}} + {\listxadd{\cbx@apa@names}{\thefield{fullhash}}}} \newbibmacro*{cite:labelyear}{% \printfield{labelyear}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 7d360372ddf..a279d40978f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -1,4 +1,4 @@ -%% Copyright 2013 Philip Kime +%% Copyright 2016 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.dbx}[2015/01/23\space v6.7\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2016/03/01\space v6.8\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx index 3e0c8e65e9e..307c04867aa 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % (APA 6.22) The example abbreviations @@ -59,11 +59,12 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{austrian}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -81,7 +82,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -111,7 +112,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 8dd20f9a17c..105a4e6f985 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations @@ -58,7 +58,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{brazilian}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#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 68ad344e6a8..55e18e20caa 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{british}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx new file mode 100644 index 00000000000..ff8856cac29 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx @@ -0,0 +1,135 @@ +\ProvidesFile{danish-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\InheritBibliographyExtras{danish} + +% (APA 6.22) The example abbreviations + +\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{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {danish}, + revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{hentet}{hentet}}, + available = {{tilgængelig}{tilgængelig}}, + from = {{fra}{fra}}, + archivedat = {{arkiveret\space ved}{arkiveret\space ved}}, + reviewof = {{anmeldelse\space af}{anmeldelse\space af}}, + producer = {{producer}{producer}}, + execproducer = {{producent}{producent}}, + director = {{instrukt{\o}r}{instrukt{\o}r}}, + writer = {{manuskript}{manuskript}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{januar}{januar}}, + february = {{februar}{februar}}, + march = {{marts}{marts}}, + april = {{april}{april}}, + may = {{maj}{maj}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{august}{august}}, + september = {{september}{september}}, + 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}}, + typechair = {{ordstyrer}{ordstyrer}}, + typechairs = {{ordstyrere}{ordstyrere}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rer}{bindred\adddot}}, + 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}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx index 71dfc48f1dd..877d0db571e 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{dutch}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#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 8b1afeffd7a..a3a6a4db527 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx @@ -1,5 +1,5 @@ -\ProvidesFile{english-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] -\InheritBibliographyExtras{american} +\ProvidesFile{english-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] +\InheritBibliographyExtras{english} % (APA 6.22) The example abbreviations @@ -66,7 +66,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{english}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#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 f76714753b0..5aed1d1b4dc 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -59,7 +59,8 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{french}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#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 8c49ff5af5d..d05f5172732 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -59,11 +59,12 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{german}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -81,7 +82,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -111,7 +112,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 4049e234f3f..9e884be07a8 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{greek}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\lbx@gr@mkbibmonth#1{% \ifcase0#1\relax #1\BibliographyWarning{Month out of range}% 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 ca12d91253d..2773f3cf72b 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{italian}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#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 cf09edd1297..45446228609 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations @@ -59,11 +59,12 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{naustrian}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -81,7 +82,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -111,7 +112,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}} % 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 99acc065c91..7ff395dd210 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -59,11 +59,12 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{ngerman}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -81,7 +82,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -111,7 +112,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}} % 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 b8e182f6bf6..99e861a4656 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{norsk}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#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 cee11ffd407..aac86314eaf 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{norwegian}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% 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 6eb8669f1dc..6766dd9ec67 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations @@ -64,7 +64,8 @@ % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{nynorsk}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx index 8c399ffe1da..d0e8c540065 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations @@ -97,7 +97,8 @@ #1\BibliographyWarning{Month out of range}% \fi}% -\DefineBibliographyExtras{slovene}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% 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 49cd4699b95..2e6692bb424 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -76,7 +76,8 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{spanish}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% 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 5aafb66b208..0ff1c2dd48b 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}[2015/01/23\space v6.7\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations @@ -61,7 +61,8 @@ } -\DefineBibliographyExtras{swedish}{% +\DeclareBibliographyExtras{% + \def\finalandcomma{\addcomma}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% |