diff options
author | Karl Berry <karl@freefriends.org> | 2019-08-17 21:50:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-08-17 21:50:11 +0000 |
commit | 69fbc2b3e50af4fc1f26b5014c84a3142865c874 (patch) | |
tree | bb54aa2817f6adf675f0d38ca532c33e3b6a6686 /Master/texmf-dist | |
parent | 2d45bbc3808e2279c0692dbc1d9fabd5df78aa9b (diff) |
biblatex-apa (17aug19)
git-svn-id: svn://tug.org/texlive/trunk@51893 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
31 files changed, 553 insertions, 122 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index 923017d196c..d0245f48c24 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -599,6 +599,7 @@ % Testing citation with complete dates @ARTICLE{Ludwig2014, + ENTRYSUBTYPE = {nonacademic}, AUTHOR = {Ludwig, Jan}, TITLE = {Wenn nichts mehr geht}, URL = {http://www.zeit.de/campus/2014/06/pruefungsergebnis-klage}, diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib index 3d71fef3c3a..c6d6892f39e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib @@ -13,13 +13,15 @@ } % (APA 7.01 Example 2) +% Note here that there is a month but this should not be shown in ARTICLES +% as per 6.28 @ARTICLE{7.01:2, AUTHOR = {D. G. Gilbert and J. F. McClernon and N. E. Rabinovich and C. Sugai and L. C. Plath and G. Asgaard and D. Dickinson and N. Botros}, TITLE = {Effects of Quitting Smoking and {EEG} Activation and Attention Last for More Than 31 Days and are More Severe With Stress, Dependence, {DRD2 A1} Allele, and Depressive Traits}, JOURNALTITLE = {Nicotine and Tobacco Research}, VOLUME = {6}, PAGES = {249--267}, - DATE = {2004}, + DATE = {2004-06-22}, DOI = {10.1080/14622200410001676305} } @@ -78,7 +80,10 @@ } % (APA 7.01 Example 7) +% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Magazine Article" +% and has different date format requirements @ARTICLE{7.01:7, + ENTRYSUBTYPE = {nonacademic}, AUTHOR = {J. Chamberlin and A. Novotney and E. Packard and M. Price}, TITLE = {Enhancing Worker Well-being}, SUBTITLE = {Occupational Health Psychologists Convene to Share Their Research on Work, Stress, and Health}, @@ -90,7 +95,10 @@ } % (APA 7.01 Example 8) +% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Online Magazine Article" +% and has different date format requirements @ARTICLE{7.01:8, + ENTRYSUBTYPE = {nonacademic}, AUTHOR = {Richard Clay}, TITLE = {Science vs. Ideology}, SUBTITLE = {Psychologists Fight Back About the Misuse of Research}, @@ -104,7 +112,10 @@ % (APA 7.01 Example 9) % The date format in the formatted APA example is inconsistent with all other date % range examples which have a '-' separating the range. We use '-' here too. +% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Newsletter Article" +% and has different date format requirements @ARTICLE{7.01:9, + ENTRYSUBTYPE = {nonacademic}, TITLE = {Six Sites Meet for Comprehensive Anti-gang Initiative Conference}, SHORTTITLE = {Six Sites Meet}, JOURNALTITLE = {OJJDP News {@} a Glance}, 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 9fed2052a65..11016b53236 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 0453a5d6d73..f579f3b8762 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 f3237af69fa..c8cd5abba37 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={7.7}, + revision={7.8}, date={\today}} \hypersetup{% @@ -44,6 +44,19 @@ Please see the revision history below (section \ref{rev}) for details on change version. This section is just for important things like incompatible changes which users should be aware of. +\minisec{7.8} +|ARTICLE| entries now correctly do not print month/day in the bibliography +as per APA 6.28. For non-academic articles (APA 7.01, examples 7, 8 and 9), +use the new: + +\begin{verbatim} + ENTRYSUBTYPE = {nonacademic} +\end{verbatim} + +This will allow month/day data in the bibliography. In the future, there +may be other differences for |ARTICLE| subtypes and it is better to keep +these semantically distinct from standard academic journal articles. + \minisec{7.5} This version requires |biblatex| $>=$3.8 and |biber| $>=$2.8. @@ -369,14 +382,7 @@ The |\fullcite| command uses ampersands, like the references section and there is also a |\fullcitebib| command which is the same as |\fullcite| but which fakes a mini references section with APA style indentation and so is not intended to be used inline like -|\fullcite|. See examples in the test file. Please note that APA style -does not have multiple citation lists sorted---they appear in the -order cited. Since |\fullcitebib| is a citation command, the citations -will not be sorted which might appear odd since this «citation» style -looks like a references section excerpt. There is no way around this -since the |sortcites| biblatex option is a package-level option. If -you want to customise such a fake references section «citation», you -should probably be using |\printbibliography| with a filter. +|\fullcite|. See examples in the test file. \subsection{References}\label{refs} @@ -458,6 +464,10 @@ applied to the data stream by |biber| and does not change your \file{.bib}. \begin{changelog} +\begin{release}{7.8}{2019} +\item Fixed date rules for |ARTICLE|s +\end{release} + \begin{release}{7.7}{2018-04-02} \item Bug fixes and example alignments \end{release} @@ -854,3 +864,7 @@ applied to the data stream by |biber| and does not change your \file{.bib}. \end{changelog} \end{document} + +% Local Variables: +% TeX-engine: luatex +% End: 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 b58b1a835ed..516598adc60 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -71,6 +71,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -87,6 +93,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -103,6 +115,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#2}% {}% {\mkbibmonth{\thefield{#2}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 09b1843825a..a7d95e25f37 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 2018 Philip Kime +%% Copyright 2019 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}[2018/04/02\space v7.7\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2019/08/17\space v7.8\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -414,7 +414,7 @@ \DeclareNameFormat{apaauthor}{% \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} - {\addcomma\addspace\ldots\addspace} + {\addcomma\space\ldots\space} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} {\iffieldannotation{uncertain} @@ -698,7 +698,7 @@ \DeclareNameFormat{apanames}{% \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} - {\addcomma\addspace\ldots} + {\addcomma\space\ldots\space} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} {\usebibmacro{name:apa:given-family}% @@ -1075,7 +1075,7 @@ \newcommand*{\begrelateddelimreviewof}{\addspace} \DeclareFieldFormat[review]{title}{% \entrydata*{\thefield{related}}{% - \iffieldequalstr{entrytype}{article} + \ifentrytype{article} {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}} {\printtext[apacase]{\thefield{savedtitle}}}}} @@ -1342,7 +1342,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{journal+issuetitle}% @@ -1367,7 +1367,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{newspaper}% @@ -1394,7 +1394,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle+title}% \setunit{\addspace}\newblock \usebibmacro{book:editor+trans}% @@ -1423,7 +1423,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \printfield{howpublished}% @@ -1450,7 +1450,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{booktitle}% @@ -1483,7 +1483,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{location+publisher}% @@ -1510,7 +1510,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \usebibmacro{editor+trans}% @@ -1543,7 +1543,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \usebibmacro{editor+trans}% @@ -1576,7 +1576,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \usebibmacro{editor+trans}% @@ -1620,7 +1620,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \printfield{edition}% @@ -1653,7 +1653,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \printfield{entrysubtype}% @@ -1685,7 +1685,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \setunit*{\addspace}% @@ -1713,7 +1713,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title+issuetitle}% \setunit{\adddot\addspace} \usebibmacro{journal}% @@ -1742,7 +1742,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \usebibmacro{apa:reportnum}% \newunit\newblock @@ -1768,7 +1768,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \usebibmacro{type+institution}% @@ -1791,7 +1791,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{reviewauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newblock \iftoggle{bbx:related} @@ -1818,7 +1818,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \newunit\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \printfield{entrysubtype}% @@ -1853,7 +1853,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \newunit\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{datatitle}% \newunit\newblock \printfield{type}% @@ -1882,7 +1882,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \printlist{institution}% @@ -1909,7 +1909,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \printlist{institution}% @@ -1940,7 +1940,7 @@ \usebibmacro{producer}% \newunit\newblock \usebibmacro{labelyear+extradate}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock \printfield{entrysubtype}% @@ -1969,7 +1969,7 @@ \usebibmacro{producer}% \newunit\newblock \usebibmacro{labelyear+extradate}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock \printfield{entrysubtype}% @@ -1998,7 +1998,7 @@ \usebibmacro{producer}% \newunit\newblock \usebibmacro{labelyear+extradate}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock \printfield{entrysubtype}% @@ -2021,7 +2021,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock \usebibmacro{album}% @@ -2041,7 +2041,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{apa:softwaretitle}% \newunit\newblock \usebibmacro{location+publisher}% @@ -2061,7 +2061,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit\newblock \printfield{howpublished}% @@ -2152,7 +2152,7 @@ \DeclareFieldFormat{doi}{% doi\addcolon \ifhyperref - {\href{https://dx.doi.org/#1}{\nolinkurl{#1}}} + {\href{https://doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 8a6faa23927..120a9eb7bd3 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 2018 Philip Kime +%% Copyright 2019 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}[2018/04/02\space v7.7\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2019/08/17\space v7.8\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -52,19 +52,19 @@ {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{citeyear}} - {} - {\usebibmacro{postnote}% + \usebibmacro{citeyear}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -184,25 +184,16 @@ % SHORTAUTHOR brackets in parencites \DeclareNameFormat{sabrackets}{% - \ifciteseen - {\usebibmacro{labelname:doname}% - {\namepartfamily}% - {\namepartfamilyi}% - {\namepartgiven}% - {\namepartgiveni}% - {\namepartprefix}% - {\namepartprefixi}% - {\namepartsuffix}% - {\namepartsuffixi}} - {\mkbibbrackets{\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} @@ -386,13 +377,13 @@ {\usebibmacro{citeindex}% \global\booltrue{cbx:np}% \usebibmacro{textcite}% + \usebibmacro{cite:post} \global\boolfalse{cbx:np}}% {} {\iffieldundef{postnote} {} {\printdelim{nameyeardelim}% - \printfield{postnote}}% - \usebibmacro{cite:post}} + \printfield{postnote}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -431,10 +422,10 @@ \global\boolfalse{bbx:editorinauthpos}% \global\boolfalse{bbx:in}% \global\let\blx@related@loop\@empty} - {\thefield{entrytype}}} - {\multicitedelim} - {\usebibmacro{postnote}% + {\thefield{entrytype}}% \usebibmacro{cite:post}} + {\multicitedelim} + {\usebibmacro{postnote}} \DeclareCiteCommand{\fullcitebib} {\list{} @@ -449,10 +440,11 @@ \global\boolfalse{bbx:titleinauthpos}% \global\boolfalse{bbx:editorinauthpos}% \global\boolfalse{bbx:in}} - {\thefield{entrytype}}\finentry} - {\item} - {\endlist + {\thefield{entrytype}}% + \finentry \usebibmacro{cite:post}} + {\item} + {\endlist} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -499,29 +491,29 @@ {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{citeyear}} - {} - {\usebibmacro{postnote}% + \usebibmacro{citeyear}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\bibsentence \usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} @@ -529,18 +521,18 @@ {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{textcite}} - {} - {\usebibmacro{textcite:postnote}% + \usebibmacro{textcite}% \usebibmacro{cite:post}} + {} + {\usebibmacro{textcite:postnote}} \DeclareCiteCommand{\citeauthor} {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite:author}} - {} - {\usebibmacro{postnote}% + \usebibmacro{cite:author}% \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 5739c5ba5db..0644fe4bbde 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 2018 Philip Kime +%% Copyright 2019 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.dbx}[2018/04/02\space v7.7\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2019/08/17\space v7.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 ddfc284126c..5ccb703d38b 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % Following DGPs guidlines for German/Austrian @@ -69,6 +69,12 @@ \renewcommand{\apashortdash}{~}% \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -85,6 +91,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -102,6 +114,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\mkbibordinal{\thefield{#3}}}% 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 24603035b8e..7d139b2ac06 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations @@ -63,6 +63,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -79,6 +85,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -95,6 +107,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 c0b2a9cb66e..cd1daff3bc6 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -85,6 +91,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -101,6 +113,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#2}% {}% {\mkbibmonth{\thefield{#2}}}% 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 8fc789aeb77..510491623ea 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{danish} % (APA 6.22) The example abbreviations @@ -81,6 +81,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\thefield{#1}}% @@ -99,6 +105,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\thefield{#1}\printfield{extradate}}% @@ -117,6 +129,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 55250f4c83d..ed898dc9c2c 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -85,6 +91,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -101,6 +113,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 8a55d1a9170..dc965a40a4d 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{english} % (APA 6.22) The example abbreviations @@ -71,6 +71,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -87,6 +93,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -103,6 +115,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#2}% {}% {\mkbibmonth{\thefield{#2}}}% 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 40d380aac86..d383fa2d487 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -64,6 +64,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -80,6 +86,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -96,6 +108,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 090a5ee3adb..774b5627826 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \renewcommand{\apashortdash}{~}% \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -85,6 +91,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -102,6 +114,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\mkbibordinal{\thefield{#3}}}% 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 6a9421363e9..6df653b6b59 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations @@ -87,6 +87,12 @@ #1\BibliographyWarning{Month out of range}% \fi}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -103,6 +109,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -119,6 +131,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 afeb25143c0..851966f6f39 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -85,6 +91,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -101,6 +113,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#2}% {}% {\mkbibmonth{\thefield{#2}}}% 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 b0f17e56c95..e291ff1fae5 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \renewcommand{\apashortdash}{~}% \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -85,6 +91,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -102,6 +114,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\mkbibordinal{\thefield{#3}}}% 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 67f7ed9e1eb..477eaa53384 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -30,6 +30,7 @@ \DeclareBibliographyStrings{% inherit = {ngerman}, + abstract = {{Abstract}{Abstract}}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, @@ -39,8 +40,8 @@ with = {{mit}{mit}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, - on = {{am}{am}}, - retrieved = {{Zugriff}{Zugriff}}, + on = {{auf}{auf}}, + retrieved = {{verf\"ugbar}{verf\"ugbar}}, available = {{Erh\"altlich}{Erh\"altlich}}, from = {{unter}{unter}}, archivedat = {{archiviert\space unter}{archiviert\space unter}}, @@ -58,6 +59,7 @@ typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, + nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}} } @@ -69,6 +71,12 @@ \renewcommand{\apashortdash}{~}% \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -85,6 +93,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -102,6 +116,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\mkbibordinal{\thefield{#3}}}% 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 10726d6a5fc..a6cdf38d3d9 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -87,6 +93,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -105,6 +117,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 282eefb2721..a8e91d04bd6 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -87,6 +93,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -105,6 +117,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 2134abf4392..bef50372024 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{nswissgerman-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{nswissgerman} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \renewcommand{\apashortdash}{~}% \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -85,6 +91,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -102,6 +114,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\mkbibordinal{\thefield{#3}}}% 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 7c99e6fc476..5226541065f 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations @@ -69,6 +69,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -87,6 +93,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -105,6 +117,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 702444fa5e2..55ac9bbbf26 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{portuguese} % (APA 6.22) The example abbreviations @@ -61,6 +61,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -77,6 +83,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -93,6 +105,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 0414a4186e9..851440be82c 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{russian-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{russian} % (APA 6.22) The example abbreviations @@ -74,8 +74,13 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addspace}% - % \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -93,8 +98,13 @@ {\addcomma\addspace}% \mkbibmonth{\thefield{#2}}}% {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}% - % \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -112,8 +122,13 @@ {\addcomma\addspace}% \mkbibmonth{\thefield{#2}}}% {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}% - % \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 acf2d3416d0..ac291498d64 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations @@ -102,6 +102,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -120,6 +126,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -138,6 +150,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 dd604113942..1e55c8861e1 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -81,6 +81,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -97,6 +103,12 @@ {\addspace}% \stripzeros{\thefield{#3}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -113,6 +125,12 @@ \mkbibmonth{\thefield{#2}}% }}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {el\addspace\stripzeros{\thefield{#3}}}% 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 29a862782f8..3114a15cd5f 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations @@ -66,6 +66,12 @@ \DeclareBibliographyExtras{% \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% @@ -84,6 +90,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% @@ -102,6 +114,12 @@ {\adddot\addspace}% \mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\stripzeros{\thefield{#3}}}% 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 db9aabfb902..3058f9c009d 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}[2018/04/02\space v7.7\space APA biblatex localisation] +\ProvidesFile{swissgerman-apa.lbx}[2019/08/17\space v7.8\space APA biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German @@ -69,6 +69,12 @@ \renewcommand{\apashortdash}{~}% \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -85,6 +91,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongextra#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#1}% {}% {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}% @@ -102,6 +114,12 @@ {}% {\mkbibmonth{\thefield{#2}}}}% \protected\def\mkbibdateapalongmdy#1#2#3{% + % As per 6.28, Articles only have year + \ifboolexpr{ test {\ifentrytype{article}} + and not test {\iffieldequalstr{entrysubtype}{nonacademic}} } + {\clearfield{labelmonth}% + \clearfield{labelday}} + {}% \iffieldundef{#3}% {}% {\mkbibordinal{\thefield{#3}}}% |