summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-12 22:32:57 +0000
committerKarl Berry <karl@freefriends.org>2017-11-12 22:32:57 +0000
commiteabfbd28a620feb1e4b7080f0701f2831b9a55ad (patch)
tree5f7092d1d72650511ec56baf9c92d7c3d5d6ee5f /Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
parent61e01b895064c0ebd7a7e3870450f49b675d9953 (diff)
biblatex
git-svn-id: svn://tug.org/texlive/trunk@45764 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.cbx44
1 files changed, 11 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..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}