diff options
author | Karl Berry <karl@freefriends.org> | 2020-05-30 20:57:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-05-30 20:57:29 +0000 |
commit | 56f5a7572837de5829a691aa6423885d87d3fffb (patch) | |
tree | d2142fa7a777ffadd59bb22ac17bca583773c4c3 /Master/texmf-dist | |
parent | 36b6527ce0c7d1a7e8611a596ecf38d1aae871bd (diff) |
biblatex-apa (30may20)
git-svn-id: svn://tug.org/texlive/trunk@55344 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
32 files changed, 151 insertions, 74 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf Binary files differindex 67a3ab7034e..51fe552e248 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf Binary files differindex 060ef251e59..591c07058af 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 5e46846f844..20605c07381 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -24,7 +24,7 @@ url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={9.12}, + revision={9.13}, date={\today}} \hypersetup{% @@ -397,7 +397,11 @@ the examples. \begin{changelog} -\begin{release}{9.11}{2020-05-05} +\begin{release}{9.13}{2020-05-30} +\item Fixed Spanish long date format +\end{release} + +\begin{release}{9.12}{2020-05-05} \item Fixed INPROCEEDINGS/PROCEEDINGS \end{release} diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa6-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa6-test.pdf Binary files differdeleted file mode 100644 index c056b75b0f4..00000000000 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa6-test.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa6.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa6.pdf Binary files differdeleted file mode 100644 index 0a57a7be90b..00000000000 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa6.pdf +++ /dev/null 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 972dc51bb26..7c4cf8f8d5a 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{american} \NewBibliographyString{jourarticle} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 3f5b459d884..7071b6e4228 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}[2020/05/05\space v9.12\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2020/05/30\space v9.13\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{same} % APA examples all have URLs in same font as text diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 5db566a7255..f5ac0bb0075 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}[2020/05/05\space v9.12\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2020/05/30\space v9.13\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index e43ea429631..aa5ccb71343 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}[2020/05/05\space v9.12\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2020/05/30\space v9.13\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 0ce160ef373..fa509e76d5d 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % Following DGPs guidlines for German/Austrian 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 e700f191098..c769ed240d1 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} \NewBibliographyString{jourarticle} 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 eefca870a31..a8587b0ecca 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{british} \NewBibliographyString{jourarticle} 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 0b9cf0d3ae8..8cbc8bc31d3 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{danish} \NewBibliographyString{jourarticle} 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 036e9da076b..a628eb3da94 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{dutch} \NewBibliographyString{jourarticle} 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 13ffad747bf..53dd289fcff 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{english} \NewBibliographyString{jourarticle} 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 5e77896946d..e8dc9eb374c 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{french} \NewBibliographyString{jourarticle} 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 33c72b9fd90..607d7686f76 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{galician-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{galician} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced 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 ed643434a61..68e235370a3 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{german} % Following DGPs guidlines for German/Austrian 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 7c3d5480f52..7cf6cc7cdfa 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{greek} \NewBibliographyString{jourarticle} 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 f8052bf7057..8b1730ceafd 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{italian} \NewBibliographyString{jourarticle} 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 1ba2490f0a6..375d04724ec 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % Following DGPs guidlines for German/Austrian 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 e88f26e3ba9..09ed5836c86 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % Following DGPs guidlines for German/Austrian 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 9c08165e500..ce0e5512211 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{norsk} \NewBibliographyString{revisededition} 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 ab3b089979a..334d6c55a88 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} \NewBibliographyString{revisededition} 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 d5225a03212..2cd715be0a1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nswissgerman-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{nswissgerman-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{nswissgerman} % Following DGPs guidlines for German/Austrian/Swiss German 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 c0593dc742b..10617811174 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} \NewBibliographyString{jourarticle} 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 59cac63b76c..d8d7f60c994 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{portuguese} \NewBibliographyString{jourarticle} 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 aa3a40c1994..f82ec500e0d 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{russian-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{russian} \NewBibliographyString{jourarticle} 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 6cf598049ac..e2c5c29a0c5 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{slovene} \NewBibliographyString{jourarticle} 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 9206498d3f9..7c975a11f47 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -165,69 +165,142 @@ \protected\def\mkbibdateapalong#1#2#3{% % As per 10.1, Articles only have year \ifboolexpr{ test {\ifentrytype{article}} - and not test {\ifkeyword{nonacademic}} } - {\clearfield{labelmonth}% - \clearfield{labelday}} - {}% + and not test {\ifkeyword{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% - \iffieldundef{#2}% - {}% - {\iffieldundef{#1}% - {}% - {\addcomma\addspace}% - \mkbibmonth{\thefield{#2}}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% \iffieldundef{#3}% {}% - {\iffieldundef{#2}% - {}% - {\addspace}% - \stripzeros{\thefield{#3}}}}% + {\stripzeros{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace de\space}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% % As per 10.1, Articles only have year \ifboolexpr{ test {\ifentrytype{article}} - and not test {\ifkeyword{nonacademic}} } - {\clearfield{labelmonth}% - \clearfield{labelday}} - {}% + and not test {\ifkeyword{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% - {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% - \iffieldundef{#2}% - {}% - {\iffieldundef{#1}% - {}% - {\addcomma\addspace}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}% + \printfield{extradate}% + \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}} + {} + {\addcomma\space}}% \iffieldundef{#3}% {}% - {\iffieldundef{#2}% - {}% - {\stripzeros{\thefield{#3}}\addspace de\addspace}}% - \mkbibmonth{\thefield{#2}}% -}}% + {\stripzeros{\thefield{#3}}% + \iffieldundef{#2} + {} + {\addspace de\space}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% % As per 10.1, Articles only have year \ifboolexpr{ test {\ifentrytype{article}} - and not test {\ifkeyword{nonacademic}} } - {\clearfield{labelmonth}% - \clearfield{labelday}} - {}% + and not test {\ifkeyword{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% - {}% - {el\addspace\stripzeros{\thefield{#3}}}% + {}% + {el\addspace\stripzeros{\thefield{#3}}}% \iffieldundef{#2}% - {\addspace{en}\addspace}% - {\iffieldundef{#3}% - {en\addspace}% - {\addspace{de}\addspace}% - \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}% + {\addspace{en}\addspace}% + {\iffieldundef{#3}% + {en\addspace}% + {\addspace{de}\addspace}% + \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}% \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% {}% - {\iffieldundef{#2}% - {}% - {\addspace}% - \thefield{#1}}}} + {\addspace}% + \thefield{#1}}}% + \def\apa@lbx@es@mkdaterangeapalong#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \iffieldsequal{#1year}{#1endyear} + {\iffieldsequal{#1month}{#1endmonth} + {\mkbibdateapalongmdy{}{}{#1day}} + {\mkbibdateapalongmdy{}{#1month}{#1day}}} + {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}% + \dateuncertainprint}} + {\printtext{% + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalong{#1year}{}{#1day}}% + {\mkbibdateapalong{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}% + \endgroup}% + \def\apa@lbx@es@mkdaterangeapalongextra#1{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}}} + {\mkbibdateapalongextra{#1year}{}{#1day}}% + {\mkbibdateapalongextra{#1year}{#1month}{#1day}}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}% + \endgroup}% + \savecommand\mkdaterangeapalong + \savecommand\mkdaterangeapalongextra + \def\mkdaterangeapalong{% + \apa@lbx@es@mkdaterangeapalong}% + \def\mkdaterangeapalongextra#1{% + \apa@lbx@es@mkdaterangeapalongextra{#1}}% +} + + +\UndeclareBibliographyExtras{% + \restorecommand\mkdaterangeapalong + \restorecommand\mkdaterangeapalongextra +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 f653f2cda52..db122c22738 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{swedish} \NewBibliographyString{jourarticle} 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 cabc3685aa2..fde62e3abab 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}[2020/05/05\space v9.12\space APA biblatex localisation] +\ProvidesFile{swissgerman-apa.lbx}[2020/05/30\space v9.13\space APA biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German |