diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-05 23:51:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-05 23:51:11 +0000 |
commit | 24f27b13d3ff59a9fc025ce009af154a95fd9acf (patch) | |
tree | ab567aa908a22d634c40bf2037cca0ae2f38be7f /Master/texmf-dist/tex/latex/biblatex/cbx | |
parent | 95108cf71ce35a8dc9cb0739da991e6c4b950f4a (diff) |
revert to biblatex 3.7, since 3.8 (and companion biber) was apparently not ready
git-svn-id: svn://tug.org/texlive/trunk@45702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx')
21 files changed, 309 insertions, 223 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx index efcc901a715..26625b06fb7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx @@ -5,18 +5,11 @@ \renewcommand*{\iffinalcitedelim}{\iflastcitekey} -\providebool{bbx:subentry} - -\DeclareFieldFormat{entrysetcount}{\mkbibparens{\mknumalph{#1}}} - \newbibmacro*{cite}{% \printtext[bibhyperref]{% \printfield{labelprefix}% \printfield{labelalpha}% - \printfield{extraalpha}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \printfield{extraalpha}}} \newbibmacro*{textcite}{% \ifnameundef{labelname} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx index e6f4d7d4253..434986c6627 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx @@ -6,19 +6,13 @@ \renewcommand*{\iffinalcitedelim}{% \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} -\providebool{bbx:subentry} \newbool{cbx:parens} -\DeclareFieldFormat{entrysetcount}{\mkbibparens{\mknumalph{#1}}} - \newbibmacro*{cite}{% \printtext[bibhyperref]{% \printfield{labelprefix}% \printfield{labelalpha}% - \printfield{extraalpha}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \printfield{extraalpha}}} \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} @@ -37,7 +31,7 @@ \usebibmacro{cite}% \setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}} @@ -53,11 +47,11 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx index 6d0daecea0a..1bf883a4196 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx @@ -25,8 +25,10 @@ \iffieldundef{shorthand} {\iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \savefield{namehash}{\cbx@lasthash}}% \usebibmacro{cite:title}} {\usebibmacro{cite:shorthand}% @@ -42,10 +44,12 @@ \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx index 4c901a43b78..3b6618314b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx @@ -20,8 +20,10 @@ \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \usebibmacro{cite:title}}}% {\usebibmacro{cite:shorthand}}} @@ -35,10 +37,12 @@ \newbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% - \printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + \ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx index 3ae9a578027..2c6190900cd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx @@ -35,11 +35,13 @@ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\setunit{\compcitedelim}} + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \savefield{namehash}{\cbx@lasthash}}% - \usebibmacro{cite:title}}}% + \usebibmacro{cite:title}}}% {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% \setunit{\multicitedelim}} @@ -55,10 +57,12 @@ \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} @@ -98,20 +102,20 @@ {} {\ifnameundef{labelname} {\setunit{% - \global\booltrue{cbx:parens}% - \extpostnotedelim\bibopenparen}} + \global\booltrue{cbx:parens}% + \extpostnotedelim\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% \textcitedelim}}} \DeclareCiteCommand{\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx index bd463aa5a28..85cce7eedcd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx @@ -17,8 +17,8 @@ {\ifsingletitle {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% - \setunit{\printdelim{nametitledelim}}% - \usebibmacro{cite:title}}}% + \setunit{\printdelim{nametitledelim}}% + \usebibmacro{cite:title}}}% \savefield{namehash}{\cbx@lasthash}}} {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% @@ -42,24 +42,24 @@ {\usebibmacro{cite:shorthand}}} {\ifnameundef{labelname} {\ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}} {\ifthenelse{\ifsingletitle\AND \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname} \setunit{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% - \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% - \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}}}% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \setunit{% @@ -79,12 +79,12 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% \textcitedelim}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx index 1ffd3ba454d..d83c432fd56 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx @@ -11,8 +11,8 @@ {\ifsingletitle {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% - \setunit{\printdelim{nametitledelim}}% - \usebibmacro{cite:title}}}}% + \setunit{\printdelim{nametitledelim}}% + \usebibmacro{cite:title}}}}% {\usebibmacro{cite:shorthand}}} \renewbibmacro*{textcite}{% @@ -27,14 +27,14 @@ \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% - \setunit{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% - \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% - \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}}}} + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx index 1fe4075cf31..54f10d6baaf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx @@ -12,15 +12,15 @@ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}% + {\setunit{\compcitedelim}% \usebibmacro{cite:title}} - {\ifnameundef{labelname} + {\ifnameundef{labelname} {\usebibmacro{cite:title}} {\ifsingletitle - {\printtext[bibhyperref]{\printnames{labelname}}} - {\printnames{labelname}% - \setunit{\printdelim{nametitledelim}}% - \usebibmacro{cite:title}}}% + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}% + \usebibmacro{cite:title}}}% \savefield{namehash}{\cbx@lasthash}}}} {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% @@ -31,9 +31,9 @@ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}} - {\savefield{namehash}{\cbx@lasthash}}% - \usebibmacro{cite:title}}} + {\setunit{\compcitedelim}} + {\savefield{namehash}{\cbx@lasthash}}% + \usebibmacro{cite:title}}} {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% \setunit{\multicitedelim}} @@ -44,32 +44,32 @@ \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:title}}}% + {\usebibmacro{cite:title}}}% {\usebibmacro{cite:shorthand}}} {\ifnameundef{labelname} {\ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} - {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:title}}}% - {\usebibmacro{cite:shorthand}}} + {\usebibmacro{cite:title}}}% + {\usebibmacro{cite:shorthand}}} {\ifthenelse{\ifsingletitle\AND \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname} \setunit{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% - \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% - \iffieldundef{shorthand} - {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} - {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:title}}}% - {\usebibmacro{cite:shorthand}}}}% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:title}}}% + {\usebibmacro{cite:shorthand}}}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \setunit{% @@ -89,12 +89,12 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% \textcitedelim}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx index 3b3ed80deb7..8d52c873f3a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx @@ -9,8 +9,10 @@ \newbibmacro*{cite}{% \iffieldundef{shorthand} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}} @@ -20,10 +22,12 @@ {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% - \printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + \ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx index 71e49ffbc9e..73f975bb976 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx @@ -28,19 +28,19 @@ {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% \setunit{\printdelim{nonameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}} {\iffieldequals{namehash}{\cbx@lasthash} {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}} {\usebibmacro{cite:shorthand}% @@ -56,11 +56,11 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} - {\usebibmacro{cite:labeldate+extradate}% + {\usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}} {\usebibmacro{cite:shorthand}% @@ -73,9 +73,9 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\setunit{\compcitedelim}% \usebibmacro{cite:shorthand}% @@ -89,7 +89,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -101,7 +101,7 @@ \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}% + {\usebibmacro{cite:labelyear+extrayear}}% \savefield{labelyear}{\cbx@lastyear}} {\usebibmacro{cite:shorthand}% \global\undef\cbx@lastyear}}% @@ -121,25 +121,43 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\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}} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{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}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} -\newbibmacro*{cite:extradate}{% - \iffieldundef{extradate} +\newbibmacro*{cite:extrayear}{% + \iffieldundef{extrayear} {} - {\printtext[bibhyperref]{\printfield{extradate}}}} - -\newbibmacro{cite:extrayear}{% - \def\blx@warning{bibmacro 'cite:extrayear' is deprecated.\MessageBreak - Using 'cite:extrayear' instead.}% - \usebibmacro{cite:extrayear}} + {\printtext[bibhyperref]{\printfield{extrayear}}}} \newbibmacro*{textcite:postnote}{% \usebibmacro{postnote}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx index c69a1a28b4e..7148258f0fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx @@ -25,7 +25,7 @@ \setunit{\printdelim{nonameyeardelim}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}}% - \usebibmacro{cite:labeldate+extradate}}} + \usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{citeyear}{% @@ -35,7 +35,7 @@ {\usebibmacro{cite:ibid}} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}}} + {\usebibmacro{cite:labelyear+extrayear}}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% @@ -49,7 +49,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -63,7 +63,7 @@ {\usebibmacro{cite:ibid}} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}}} + {\usebibmacro{cite:labelyear+extrayear}}}} {\usebibmacro{cite:shorthand}}}} \newbibmacro*{cite:shorthand}{% @@ -80,15 +80,38 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\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}} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{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}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} \newbibmacro*{cite:postnote}{% \ifbool{cbx:loccit} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx index b7d9cc6ce8f..4bb47ceeea1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx @@ -38,19 +38,19 @@ {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% \setunit{\printdelim{nonameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}} {\iffieldequals{namehash}{\cbx@lasthash} {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}}} {\usebibmacro{cite:shorthand}% @@ -68,11 +68,11 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} - {\usebibmacro{cite:labeldate+extradate}% + {\usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}}} {\usebibmacro{cite:shorthand}% @@ -85,9 +85,9 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\setunit{\compcitedelim}% \usebibmacro{cite:shorthand}% @@ -103,7 +103,7 @@ {}% \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:labeldate+extradate}}} + {\usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -117,7 +117,7 @@ {\usebibmacro{cite:label}} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:labeldate+extradate}}}% + {\usebibmacro{cite:labelyear+extrayear}}}% \savefield{labelyear}{\cbx@lastyear}} {\usebibmacro{cite:shorthand}% \global\undef\cbx@lastyear}}% @@ -137,25 +137,43 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\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*{cite:extradate}{% - \iffieldundef{extradate} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{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}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} + +\newbibmacro*{cite:extrayear}{% + \iffieldundef{extrayear} {} - {\printtext[bibhyperref]{\printfield{extradate}}}} - -\newbibmacro{cite:extrayear}{% - \def\blx@warning{bibmacro 'cite:extrayear' is deprecated.\MessageBreak - Using 'cite:extrayear' instead.}% - \usebibmacro{cite:extrayear}} + {\printtext[bibhyperref]{\printfield{extrayear}}}} \newbibmacro*{cite:ibid}{% \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index cff210e5f1f..fd411c90b55 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:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{citeyear}{% \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}} + {\usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% @@ -34,7 +34,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -53,15 +53,38 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\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}} + {\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}}}}}} \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx index b649cbeaee8..7f2b64d569c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx @@ -103,7 +103,7 @@ {\usebibmacro{cite:comp}} {\usebibmacro{cite:dump}% \ifbool{cbx:parens} - {\printtext{\bibclosebracket}\global\boolfalse{cbx:parens}} + {\bibclosebracket\global\boolfalse{cbx:parens}} {}% \iffirstcitekey {} @@ -112,8 +112,8 @@ \ifnameundef{labelname} {\printfield[citetitle]{labeltitle}} {\printnames{labelname}}% - \setunit*{\printdelim{namelabeldelim}}% - \printtext{\bibopenbracket}\global\booltrue{cbx:parens}% + \global\booltrue{cbx:parens}% + \printdelim{namelabeldelim}\bibopenbracket% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx index 8ea47d1338d..81b3bcb80e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx @@ -26,8 +26,9 @@ {\ifnameundef{labelname} {\printfield[citetitle]{labeltitle}} {\printnames{labelname}}% - \setunit*{\printdelim{namelabeldelim}}% - \printtext{\bibopenbracket}\global\booltrue{cbx:parens}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namelabeldelim}\bibopenbracket}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} @@ -36,7 +37,7 @@ \usebibmacro{cite}% \setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}} @@ -52,11 +53,11 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx index 02a7aad2d89..ae5dccc7ca7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx @@ -78,9 +78,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -101,8 +101,8 @@ {\iffieldundef{shorthand} {\ifboolexpr{ test {\ifciteibid} - and - not test {\iffirstonpage} + and + not test {\iffirstonpage} } {\usebibmacro{cite:ibid}} {\usebibmacro{cite:short}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx index 5749af7793d..6fc88f6b6d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx @@ -79,9 +79,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -178,8 +178,8 @@ {\ifsamepage{\the\value{instcount}} {\csuse{cbx@f@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace - \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} + {\addcomma\space\bibstring{page}\addnbspace + \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} {}}} \newbibmacro*{footcite:shorthand}{% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx index 5b67757ce4d..42156224c97 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx @@ -73,9 +73,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -155,8 +155,8 @@ {\ifsamepage{\the\value{instcount}} {\csuse{cbx@f@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace - \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} + {\addcomma\space\bibstring{page}\addnbspace + \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} {}}} \newbibmacro*{footcite:shorthand}{% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx index a361766f169..33841be3ed6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx @@ -79,9 +79,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -116,8 +116,8 @@ {\usebibmacro{cite:name}% \ifopcit {\ifloccit - {\usebibmacro{cite:loccit}} - {\usebibmacro{cite:opcit}}} + {\usebibmacro{cite:loccit}} + {\usebibmacro{cite:opcit}}} {\usebibmacro{cite:title}}}}}% \usebibmacro{cite:save}} {\usebibmacro{cite:shorthand}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx index 9ad583e1992..0461eb14d20 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx @@ -86,9 +86,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -119,7 +119,7 @@ {\usebibmacro{cite:idem}} {\usebibmacro{cite:name}}% \usebibmacro{cite:title}}% - \usebibmacro{cite:save}} + \usebibmacro{cite:save}} {\usebibmacro{cite:shorthand}}} {\usebibmacro{cite:full}% \usebibmacro{cite:save}}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx index 1fab909cc4f..80a45d6a004 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx @@ -74,9 +74,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -96,13 +96,13 @@ \ifciteseen {\ifciteibid {\ifloccit - {\usebibmacro{cite:ibid}} - {\iffieldundef{shorthand} - {\usebibmacro{cite:opcit}} - {\usebibmacro{cite:shorthand}}}} + {\usebibmacro{cite:ibid}} + {\iffieldundef{shorthand} + {\usebibmacro{cite:opcit}} + {\usebibmacro{cite:shorthand}}}} {\iffieldundef{shorthand} - {\usebibmacro{cite:short}} - {\usebibmacro{cite:shorthand}}}} + {\usebibmacro{cite:short}} + {\usebibmacro{cite:shorthand}}}} {\usebibmacro{cite:full}}} \newbibmacro*{cite:full}{% |