diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-23 21:42:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-23 21:42:39 +0000 |
commit | 65e275a0bf822d6abaa473b7768030f4f73a833b (patch) | |
tree | 58c3d03b8425f4b7b86aac14bcbae5a153ec4361 /Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx | |
parent | 34d10d7ff2122fc34d1e535106202155ca85b4ff (diff) |
biblatex-ext (23nov18)
git-svn-id: svn://tug.org/texlive/trunk@49232 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx index 49f5fd093a1..146c0f6cf96 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-authoryear-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-common.bbx} - [2018/10/09 v0.5a common files for extended biblatex + [2018/11/23 v0.6 common files for extended biblatex authoryear bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} @@ -7,6 +7,13 @@ \DeclareFieldFormat{biblabeldate}{\mkbibparens{#1}} \DeclareFieldAlias{biblistlabeldate}{biblabeldate} +\providebibmacro*{bbx:ifmergeddate}{\@secondoftwo} + +\renewbibmacro*{date}{% + \usebibmacro{bbx:ifmergeddate} + {} + {\printdate}} + % merge date/issue with date label \def\bbx@opt@mergedate@maximum{% \renewbibmacro*{date+extradate}{% @@ -18,12 +25,9 @@ \setunit*{\addspace}% \printdateextra} {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{issue+date}{% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} {\printtext[issuedate]{% \printfield{issue}% @@ -39,20 +43,18 @@ \iflabeldateisdate {\printdateextra} {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{issue+date}{% - \ifboolexpr{not test {\iffieldundef{issue}} - or not test {\iflabeldateisdate}} + \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}} + and + test {\iffieldundef{issue}}} + {} {\printtext[issuedate]{% \printfield{issue}% \setunit*{\addspace}% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} - {\printdate}}} - {}% + {\printdate}}}% \newunit}} % merge year-only date with date label @@ -61,19 +63,16 @@ \iffieldundef{labelyear} {} {\printtext[\blx@delimcontext labeldate]{\printlabeldateextra}}}% - \renewbibmacro*{date}{% + \renewbibmacro*{bbx:ifmergeddate}{% \ifboolexpr{ test {\iflabeldateisdate} and not test {\ifdateshavedifferentprecision{label}{}} - } - {} - {\printdate}}% + }% + }% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} + test {\usebibmacro{bbx:ifmergeddate}} and test {\iffieldundef{issue}} } @@ -90,23 +89,18 @@ \iffieldundef{labelyear} {} {\printtext[\blx@delimcontext labeldate]{\printlabeldateextra}}}% - \renewbibmacro*{date}{% + \renewbibmacro*{bbx:ifmergeddate}{% \ifboolexpr{ test {\iflabeldateisdate} and not test {\ifdateshavedifferentprecision{label}{}} and test {\iffieldundef{extradate}} - } - {} - {\printdate}}% + }% + }% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - and - test {\iffieldundef{extradate}} + test {\usebibmacro{bbx:ifmergeddate}} and test {\iffieldundef{issue}} } @@ -123,7 +117,7 @@ \iffieldundef{labelyear} {} {\printtext[\blx@delimcontext labeldate]{\printlabeldateextra}}}% - \renewbibmacro*{date}{\printdate}% + \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}% \renewbibmacro*{issue+date}{% \printtext[issuedate]{% \printfield{issue}% |