diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx index c69a1a28b4e..7148258f0fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx @@ -25,7 +25,7 @@ \setunit{\printdelim{nonameyeardelim}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}}% - \usebibmacro{cite:labeldate+extradate}}} + \usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{citeyear}{% @@ -35,7 +35,7 @@ {\usebibmacro{cite:ibid}} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}}} + {\usebibmacro{cite:labelyear+extrayear}}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% @@ -49,7 +49,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -63,7 +63,7 @@ {\usebibmacro{cite:ibid}} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}}} + {\usebibmacro{cite:labelyear+extrayear}}}} {\usebibmacro{cite:shorthand}}}} \newbibmacro*{cite:shorthand}{% @@ -80,15 +80,38 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[bibhyperref]{\printlabeldateextra}}} - -\newbibmacro{cite:labelyear+extrayear}{% - \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak - Using 'cite:labeldate+extradate' instead.}% - \usebibmacro{cite:labeldate+extradate}} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{labelyear}% + \printfield{extrayear}% + \iffieldsequal{labeldateera}{labelenddateera}{} + {\dateeraprint{labelyear}}% + \dateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{labelendyear} + {} + {\iffieldsequal{labelyear}{labelendyear}{} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep + \enddatecircaprint}% + \dateeraprintpre{labelendyear}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} \newbibmacro*{cite:postnote}{% \ifbool{cbx:loccit} |