From eabfbd28a620feb1e4b7080f0701f2831b9a55ad Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 12 Nov 2017 22:32:57 +0000
Subject: biblatex

git-svn-id: svn://tug.org/texlive/trunk@45764 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/latex/biblatex/cbx/authoryear.cbx          | 44 ++++++----------------
 1 file changed, 11 insertions(+), 33 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx')

diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index fd411c90b55..04fdf152f55 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,16 @@
     {\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}{%
+  \blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak
+    Please use 'cite:labeldate+extradate'.\MessageBreak
+    Using 'cite:labeldate+extradate' instead}%
+  \usebibmacro{cite:labeldate+extradate}}
 
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}
-- 
cgit v1.2.3