diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-21 23:36:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-21 23:36:43 +0000 |
commit | bbe3c3450d28b6f3bd3be9a99d41ee39c85fa7ec (patch) | |
tree | e29155332e3f26ef097d5f2034d9a542a15af8e2 /Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx | |
parent | 0751111d87e02c33ba64bd34143fef372b644f1c (diff) |
biblatex-gost (21feb18)
git-svn-id: svn://tug.org/texlive/trunk@46709 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx index 990dd25421c..120b0e932de 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.cbx} -[2017/08/23\space v1.16\space biblatex-gost styles] +[2018/02/20\space v1.17\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, dropdates=false, @@ -68,7 +68,7 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extrayear}} + \usebibmacro{cite:extradate}} {\setunit{\compcitedelim}% \usebibmacro{cite:labelyear+extras}{bibhyperref}% \savefield{labelyear}{\cbx@lastyear}}} @@ -121,11 +121,11 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extrayear}} + \usebibmacro{cite:extradate}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labelyear+extrayear}% + \usebibmacro{cite:labelyear+extradate}% \savefield{labelyear}{\cbx@lastyear}}} - {\usebibmacro{cite:labelyear+extrayear}% + {\usebibmacro{cite:labelyear+extradate}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}}} {\usebibmacro{cite:shorthand}% @@ -138,9 +138,9 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extrayear}} + \usebibmacro{cite:extradate}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labelyear+extrayear}% + \usebibmacro{cite:labelyear+extradate}% \savefield{labelyear}{\cbx@lastyear}}} {\setunit{\compcitedelim}% \usebibmacro{cite:shorthand}% @@ -156,7 +156,7 @@ {}% \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:labelyear+extrayear}}} + {\usebibmacro{cite:labelyear+extradate}}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -170,7 +170,7 @@ {\usebibmacro{cite:label}} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:labelyear+extrayear}}}% + {\usebibmacro{cite:labelyear+extradate}}}% \savefield{labelyear}{\cbx@lastyear}} {\usebibmacro{cite:shorthand}% \global\undef\cbx@lastyear}}% @@ -193,17 +193,17 @@ {\printtext[bibhyperref]{\printtext[citetitle]{\printfield[titlecase]{labeltitle}}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labelyear+extrayear}{% +\newbibmacro*{cite:labelyear+extradate}{% \iffieldundef{labelyear} {} {\printtext[bibhyperref]{% \usebibmacro{printyear}{label}% - \printfield{extrayear}}}} + \printfield{extradate}}}} -\newbibmacro*{cite:extrayear}{% - \iffieldundef{extrayear} +\newbibmacro*{cite:extradate}{% + \iffieldundef{extradate} {} - {\printtext[bibhyperref]{\printfield{extrayear}}}} + {\printtext[bibhyperref]{\printfield{extradate}}}} \newbibmacro*{cite:ibid}{% \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}% |