summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-14 22:21:10 +0000
committerKarl Berry <karl@freefriends.org>2016-09-14 22:21:10 +0000
commit255f0a58d9bae0f193b4bd7d07885325f2fe8585 (patch)
tree1023130a997bd4b06c760600b892fcaa73fcaa30 /Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
parentada185c4b489c295d97a94e2a8095efa22bf711e (diff)
biblatex (14sep16)
git-svn-id: svn://tug.org/texlive/trunk@42063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx28
1 files changed, 14 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 4f6c6bc5dda..e27b18904e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -24,13 +24,13 @@
% merge date/issue with date label
\def\bbx@opt@mergedate@maximum{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{\thefield{datelabelsource}year}
+ \iffieldundef{labelyear}
{}
{\printtext[parens]{%
\printfield{issue}%
\setunit*{\addspace}%
- \iffieldsequal{year}{\thefield{datelabelsource}year}
- {\printdateextralabel}%
+ \iffieldsequal{year}{labelyear}
+ {\printlabeldateextra}%
{\printfield{labelyear}%
\printfield{extrayear}}}}}%
\renewbibmacro*{date}{}%
@@ -39,11 +39,11 @@
% merge date with date label
\def\bbx@opt@mergedate@compact{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{\thefield{datelabelsource}year}
+ \iffieldundef{labelyear}
{}
{\printtext[parens]{%
- \iffieldsequal{year}{\thefield{datelabelsource}year}
- {\printdateextralabel}%
+ \iffieldsequal{year}{labelyear}
+ {\printlabeldateextra}%
{\printfield{labelyear}%
\printfield{extrayear}}}}}%
\renewbibmacro*{date}{}%
@@ -56,10 +56,10 @@
% merge year-only date with date label
\def\bbx@opt@mergedate@basic{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{\thefield{datelabelsource}year}
+ \iffieldundef{labelyear}
{}
{\printtext[parens]{%
- \printfield{\thefield{datelabelsource}year}%
+ \printfield{labelyear}%
\printfield{extrayear}}}}%
\renewbibmacro*{date}{%
\iffieldundef{month}
@@ -81,10 +81,10 @@
% merge year-only date with year-only date label
\def\bbx@opt@mergedate@minimum{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{\thefield{datelabelsource}year}
+ \iffieldundef{labelyear}
{}
{\printtext[parens]{%
- \printfield{\thefield{datelabelsource}year}%
+ \printfield{labelyear}%
\printfield{extrayear}}}}%
\renewbibmacro*{date}{%
\ifboolexpr{
@@ -112,10 +112,10 @@
% don't merge date/issue with date label
\def\bbx@opt@mergedate@false{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{\thefield{datelabelsource}year}
+ \iffieldundef{labelyear}
{}
{\printtext[parens]{%
- \printfield{\thefield{datelabelsource}year}%
+ \printfield{labelyear}%
\printfield{extrayear}}}}%
\renewbibmacro*{date}{\printdate}%
\renewbibmacro*{issue+date}{%
@@ -125,8 +125,8 @@
\printdate}%
\newunit}}
-% n.b. the default datelabel=year overrides merging of months and days
-\ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker,mergedate}
+% n.b. the default labeldate=year overrides merging of months and days
+\ExecuteBibliographyOptions{labeldateparts,sorting=nyt,pagetracker,mergedate}
\DeclareFieldFormat{shorthandwidth}{#1}
\setlength{\bibitemsep}{0pt}