diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-04 21:10:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-04 21:10:04 +0000 |
commit | 8ff328d8d6a3cf9e4ce34a6cd1ee676afe63be33 (patch) | |
tree | 0701cff1cc3f9c39cd63e13feb3572e61d33d951 /Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx | |
parent | 4882493e5183ee14767c5f3c00d3f834c1bf95eb (diff) |
biblatex (4nov17)
git-svn-id: svn://tug.org/texlive/trunk@45690 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index fd411c90b55..cff210e5f1f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -14,14 +14,14 @@ \setunit{\printdelim{nonameyeardelim}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}}% - \usebibmacro{cite:labelyear+extrayear}} + \usebibmacro{cite:labeldate+extradate}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{citeyear}{% \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labelyear+extrayear}}} + {\usebibmacro{cite:labeldate+extradate}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% @@ -34,7 +34,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labelyear+extrayear}} + \usebibmacro{cite:labeldate+extradate}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -53,38 +53,15 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -% Inside \printtext, argumentless macros also need '%' afterwards -% otherwise the newlines are spaces -\newbibmacro*{cite:labelyear+extrayear}{% +\newbibmacro*{cite:labeldate+extradate}{% \iffieldundef{labelyear} {} - {\printtext[bibhyperref]{% - \ifdefstring\blx@dateformat@labeldate{edtf} - {} - {\datecircaprint}% - \dateeraprintpre{labelyear}% - \printfield{labelyear}% - \printfield{extrayear}% - \dateuncertainprint% - \iffieldsequal{labeldateera}{labelenddateera}{} - {\dateeraprint{labelyear}}% - \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}}}}}} + {\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}} \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote} |