From 00707dfd6ac16ef1f4dc0cf9512c42f2fd20ad35 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 22 Dec 2019 03:00:45 +0000 Subject: CTAN sync 201912220300 --- .../contrib/biblatex-contrib/biblatex-apa/apa.bbx | 53 ++++++---------------- 1 file changed, 15 insertions(+), 38 deletions(-) (limited to 'macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx') diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx index 65f1efd399..c06813da8b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2019/11/29\space v9.2\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2019/12/21\space v9.3\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -310,9 +310,19 @@ % Enforce ignoring of PUBSTATE if there is a YEAR or DATE field % (APA 10.2:32) Remove PUBLISHER if it is the same as GROUPAUTHOR - +% Force @COLLECTION->@BOOK and @INCOLLECTION->@INBOOK + \DeclareStyleSourcemap{ \maps[datatype=bibtex]{ + \map{ + \step[typesource=collection, typetarget=book] + } + \map{ + \step[typesource=incollection, typetarget=inbook] + } + \map{ + \step[typesource=hardware, typetarget=software] + } \map{ \step[fieldsource=year, final] \step[fieldset=pubstate, null] @@ -321,9 +331,6 @@ \step[fieldsource=date, final] \step[fieldset=pubstate, null] } - \map{ - \step[typesource=hardware, typetarget=software, final] - } \map{ \step[fieldsource=groupauthor, match=\regexp{([^{}]+)}, final] \step[fieldsource=publisher, match=\regexp{$1}, final]%$ @@ -413,6 +420,7 @@ % PAGES +\DeclareFieldFormat{pageswithprefix}{\mkpageprefix[bookpagination]{#1}} \DeclareFieldFormat[inbook,incollection]{pages}{\mkpageprefix[bookpagination]{#1}} \DeclareFieldFormat[periodical]{pages}{#1} @@ -1273,13 +1281,13 @@ \setunit{\addcomma\addspace}% \usebibmacro{doi+url}% \setunit{}} - {\ifentrytype{incollection} + {\ifentrytype{book} {\mkbibemph{% \printfield[apacase]{title}% \setunit{\subtitlepunct}% \printfield[apacase]{subtitle}}% \setunit{\addcomma\addspace}% - \printfield{pages}% + \printfield[pageswithprefix]{pages}% \setunit{\addcomma\addspace}% \biblstring{byauthor}\space \printnames[apanames][-\value{listtotal}]{editor}% @@ -1572,37 +1580,6 @@ \usebibmacro{annotation}% \usebibmacro{finentry}} -\DeclareBibliographyDriver{incollection}{% - \usebibmacro{bibindex}% - \usebibmacro{begentry}% - \usebibmacro{author/editor}% - \setunit{\printdelim{nametitledelim}}\newblock - \usebibmacro{title}% - \setunit{\addspace}\newblock - \usebibmacro{apa:related}% - \newunit\newblock - \usebibmacro{editor+trans}% - \setunit*{\addcomma\addspace}\newblock - \usebibmacro{maintitle+booktitle}% - \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{location+publisher}% - \newunit\newblock - \usebibmacro{origyear}% - \newunit\newblock - \usebibmacro{doi+url}% - \newblock - \printfield{addendum}% - \newunit\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% - \usebibmacro{pageref}% - \usebibmacro{annotation}% - \usebibmacro{finentry}} - \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% -- cgit v1.2.3