diff options
| author | Karl Berry <karl@freefriends.org> | 2016-09-14 22:21:10 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2016-09-14 22:21:10 +0000 |
| commit | 255f0a58d9bae0f193b4bd7d07885325f2fe8585 (patch) | |
| tree | 1023130a997bd4b06c760600b892fcaa73fcaa30 /Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx | |
| parent | ada185c4b489c295d97a94e2a8095efa22bf711e (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/cbx/authoryear.cbx')
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index 949a35be915..ed9c7a0591b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -1,7 +1,7 @@ \ProvidesFile{authoryear.cbx} [\abx@cbxid] -\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,autocite=inline} +\ExecuteBibliographyOptions{labeldateparts,uniquename,uniquelist,autocite=inline} \renewcommand*{\iffinalcitedelim}{\iflastcitekey} @@ -53,12 +53,38 @@ {\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}{% \iffieldundef{labelyear} {} {\printtext[bibhyperref]{% - \printfield{labelyear}% - \printfield{extrayear}}}} + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \mkyearzeros{\thefield{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}% + \mkyearzeros{\thefield{labelendyear}}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote} @@ -71,21 +97,21 @@ \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand*{\cite} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{citeyear}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibparens] - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} |