From 4683b5f1c565f269340aeeb3abc9ca31bcef9c83 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Mar 2022 20:32:01 +0000 Subject: biblatex-iso690 (21mar22) git-svn-id: svn://tug.org/texlive/trunk@62866 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-iso690/iso-authoryear.bbx | 51 +++++++++++++--------- 1 file changed, 31 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx') diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx index 6a8da0a12d4..ae08a57a398 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{iso-authoryear.bbx} - [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style] + [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% @@ -54,33 +54,33 @@ \renewbibmacro*{date}{}% % Overwrite names:primary to print year right after: +% 0) holder (only for patents) % 1) author % 2) editor % 3) label/title % Need to handle not to print editor twice (primary % and subsidiary names): editor macro includes \clearname{editor} \renewbibmacro*{names:primary}{% - % First check if we have author(s) available - \ifboolexpr{ - test \ifuseauthor - and - not test {\ifnameundef{author}} - } - {\usebibmacro{author}% - \setunit{\addspace}% - \printfield{nameaddon}% - \setunit{\printdelim{nameyeardelim}}}% - {% If no author(s) is available, check for editor(s) - \ifboolexpr{ - test \ifuseeditor - and - not test {\ifnameundef{editor}} - } + % If we have a patent with holder field, we will use that. + \ifboolexpr{test \ifuseholder and test {\ifentrytype{patent}} + and not test {\ifnameundef{holder}}} + {\usebibmacro{byholder}% + \setunit{\addspace}% + \printfield{nameaddon}% + \setunit{\printdelim{nameyeardelim}}}% + {% Otherwise, first check if we have author(s) available + \ifboolexpr{test \ifuseauthor and not test {\ifnameundef{author}}} + {\usebibmacro{author}% + \setunit{\addspace}% + \printfield{nameaddon}% + \setunit{\printdelim{nameyeardelim}}}% + {% If no author(s) is available, check for editor(s) + \ifboolexpr{test \ifuseeditor and not test {\ifnameundef{editor}}} {\usebibmacro{editor}% - \setunit{\printdelim{nameyeardelim}}}% + \setunit{\printdelim{nameyeardelim}}}% {% If no editor(s) is available, use label/title - \usebibmacro{labeltitle}% - \setunit{\printdelim{nonameyeardelim}}}}% + \usebibmacro{labeltitle}% + \setunit{\printdelim{nonameyeardelim}}}}}% % And finally print date \usebibmacro{date+extradate}% } @@ -96,6 +96,17 @@ {\printfield[title]{shorttitle}}} {\printfield{label}}} +\renewbibmacro*{urldate-space}{% + % if there is no publisher specified in the bib file, set unit to dot, + % so there is a separation between previous block + % this version doesn't check date, as it isn't printed in the publisher block + \ifboolexpr{% + test {\iflistundef{publisher}}% + and test {\iflistundef{location}}% + and test {\iffieldundef{version}}% + }{\setunit{\adddot\addspace}}% + {\setunit{\addspace}}% +} \newbool{bbx@inset} \DeclareBibliographyDriver{set}{% -- cgit v1.2.3