From 0f01ba4fdf45fa5923bdfa31d64dd0bb21cc4eaf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 30 Aug 2016 22:07:48 +0000 Subject: biblatex-gost (30aug16) git-svn-id: svn://tug.org/texlive/trunk@41955 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-gost/gost-standard.bbx | 85 ++++++++++++---------- 1 file changed, 45 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx') diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx index bca599a2ab6..d9de27c3af3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx @@ -1,8 +1,8 @@ \ProvidesFile{gost-standard.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] -\def\bbx@gost@date{2016/07/18} -\def\bbx@gost@version{1.7} +\def\bbx@gost@date{2016/08/30} +\def\bbx@gost@version{1.8} \@ifpackagelater{biblatex}{2016/03/03} {} @@ -44,11 +44,14 @@ \newtoggle{bbx:gostbibliography} \togglefalse{bbx:gostbibliography} -\protected\def\blx@imc@printupdate{\csuse{mkbibrangeshort}{up}} -\protected\def\blx@imc@printpubldate{\csuse{mkbibrangeshort}{publ}} -\protected\def\blx@imc@printprdate{\csuse{mkbibrangeshort}{pr}} +\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ + {} + {\protected\def\blx@imc@printupdate{\csuse{mkbibrangeshort}{up}} + \protected\def\blx@imc@printpublicationdate{\csuse{mkbibrangeshort}{publication}} + \protected\def\blx@imc@printprioritydate{\csuse{mkbibrangeshort}{priority}} + \newcommand{\bibdaterangesep}{\bibdatedash}} \blx@regimcs{% - \printupdate \printpubldate \printprdate} + \printupdate \printpublicationdate \printprioritydate} % OPTIONS @@ -125,7 +128,9 @@ movenames=true, giveninits, volsorder=vbpi, - related=true} + related=true, + alldates=short, + eventdate=comp} \newbibmacro*{cbx:bookibid:check}[2]{#2} @@ -144,23 +149,23 @@ \iffieldnums{volume} {\ifbibstring{volume} {\bibstring{volume}\addabbrvspace#1} - {}} + {#1}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} \DeclareFieldFormat[article,periodical]{volume}{% \ifbibstring{volume} {\bibstring{jourvol}\addabbrvspace#1} - {}} + {#1}} \DeclareFieldFormat*{book}{% \iffieldnums{book} {\ifbibstring{book} {\bibstring{book}\addabbrvspace#1} - {}} + {#1}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} \DeclareFieldFormat*{part}{% \iffieldnums{part} {\ifbibstring{part} {\bibstring{part}\addabbrvspace#1} - {}} + {#1}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} \DeclareFieldFormat{seriesnumber}{#1}% \DeclareFieldFormat*{number}{% @@ -170,15 +175,15 @@ {\unspace\adddot#1}}% {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} \DeclareFieldFormat[patent]{number}{#1}% -\DeclareFieldFormat{reqnumber}{% +\DeclareFieldFormat{requestnumber}{% \ifbibstring{number} {\bibsstring{number}\addnbspace#1} {#1}}% \newbibmacro*{volumes/parts/books/issues}[2]{% \iffieldnum{#1} {\ifbibstring{#1} - {#2~\bibsstring{#1}} - {}} + {#2\addnbspace\bibsstring{#1}} + {#2}} {\ifcapital{\MakeCapital{#2}}{#2}}} \DeclareFieldFormat{volumes}{\usebibmacro{volumes/parts/books/issues}{volumes}{#1}} \DeclareFieldFormat{parts}{\usebibmacro{volumes/parts/books/issues}{parts}{#1}} @@ -189,7 +194,7 @@ {\ifbibstring{involumes} {\bibstring{involumes}\addabbrvspace} {}% - #2~\bibsstring{#1}} + #2\addnbspace\bibsstring{#1}} {\ifcapital{\MakeCapital{#2}}{#2}}} \DeclareFieldFormat{involumes}{\usebibmacro{in+}{volumes}{#1}} \DeclareFieldFormat{inbooks}{\usebibmacro{in+}{books}{#1}} @@ -199,10 +204,10 @@ \iffieldnums{issue} {\ifbibstring{issue} {\bibstring{issue}\addabbrvspace#1} - {}} + {#1}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} \DeclareFieldFormat[article,periodical]{issue}{% - \ifinteger{#1} + \iffieldnums{issue} {\ifbibstring{issue}% {\bibstring{issue}\addabbrvspace#1}% {\unspace\adddot#1}}% @@ -217,15 +222,15 @@ \ifbibstring{updated} {\bibstring{updated}\addcolon\space#1} {Updated\addcolon\space#1}} -\DeclareFieldFormat{publdate}{% +\DeclareFieldFormat{publicationdate}{% \ifbibstring{published} {\bibstring{published}\addspace#1} {#1}} -\DeclareFieldFormat{reqdate}{% +\DeclareFieldFormat{requestdate}{% = date (in @patent) \ifbibstring{requested} {\bibstring{requested}\addspace#1} {#1}} -\DeclareFieldFormat{prdate}{% +\DeclareFieldFormat{prioritydate}{% \ifbibstring{priority} {\bibstring{priority}\addspace#1} {#1}} @@ -243,13 +248,13 @@ {}% #1\isdot} \DeclareFieldFormat{edition}{% - \ifinteger{#1} - {\mkbibordedition{#1}~\bibstring{edition}} + \iffieldnum{edition} + {\mkbibordedition{#1}\addnbspace\bibstring{edition}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} \DeclareFieldFormat[thesis]{type}{\ifbibstring{#1}{\bibsentence\biblstring{#1}}{#1}} -\DeclareFieldFormat{prcountry}{% - \ifbibxstring{\thefield{prcountry}} - {\bibcpstring{\thefield{prcountry}}} +\DeclareFieldFormat{prioritycountry}{% + \ifbibxstring{\thefield{prioritycountry}} + {\bibcpstring{\thefield{prioritycountry}}} {#1}} \DeclareNameAlias{default}{given-family} @@ -913,10 +918,10 @@ {} {\setrespdelim% \printnames[byauthor]{author}% - \iffieldundef{authortype} + \iffieldundef{authorcountry} {} {\setunit*{\addspace}% - \printfield[parens]{authortype}}% + \printfield[parens]{authorcountry}}% \setunit*{\addsemicolondelim}}% \ifnameundef{holder} {} @@ -925,7 +930,7 @@ \setunit*{\addsemicolondelim}}% \usebibmacro{credits}% \newunit\newblock - \printfield{reqnumber}% + \printfield{requestnumber}% \ifboolexpr{ test {\iffieldundef{year}} and test {\iffieldundef{month}} @@ -933,9 +938,9 @@ } {} {\setunit*{\addsemicolondelim}% - \printtext[reqdate]{\mkbibdateshort{year}{month}{day}}}% + \printtext[requestdate]{\mkbibdateshort{year}{month}{day}}}% \setunit*{\addsemicolondelim}% - \printpubldate% + \printpublicationdate% \setunit*{\addcomma\space}% \printfield{publication}% \setunit*{\addsemicolondelim}% @@ -1719,7 +1724,7 @@ {\printtext{\mkbibdatelong{}{month}{day}}}% \iffieldundef{endyear} {} - {\bibdatedash% + {\bibdaterangesep% \iffieldequalstr{endyear}{} {\mbox{~~~~}} {\printfield{endyear}% @@ -2095,13 +2100,13 @@ {}}}} \newbibmacro*{priority}{% - \printprdate% + \printprioritydate% \setunit{\addcomma\space}% - \printfield{prnumber}% + \printfield{prioritynumber}% \setunit{\addspace}% - \iffieldundef{prcountry} + \iffieldundef{prioritycountry} {} - {\printtext[parens]{\printfield{prcountry}}}} + {\printtext[parens]{\printfield{prioritycountry}}}} \newbibmacro*{heading}{% \printfield{heading}} @@ -2221,10 +2226,10 @@ \clearfield{addendum}% \clearfield{pubstate}% \clearname{holder}% - \clearfield{publyear}% - \clearfield{publmonth}% - \clearfield{publday}% - \clearfield{reqnumber}% + \clearfield{publicationyear}% + \clearfield{publicationmonth}% + \clearfield{publicationday}% + \clearfield{requestnumber}% \clearfield{publication}% \clearfield{upyear}% \clearfield{upmonth}% -- cgit v1.2.3