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/biblatex-gost.dbx | 32 ++++---- .../tex/latex/biblatex-gost/biblatex-gost.def | 26 +++---- .../latex/biblatex-gost/gost-alphabetic-min.bbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.bbx | 4 +- .../tex/latex/biblatex-gost/gost-alphabetic.cbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.bbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.bbx | 9 ++- .../tex/latex/biblatex-gost/gost-authoryear.cbx | 15 ++-- .../tex/latex/biblatex-gost/gost-footnote-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.cbx | 2 +- .../tex/latex/biblatex-gost/gost-inline-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-inline-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-inline.bbx | 9 ++- .../tex/latex/biblatex-gost/gost-inline.cbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.bbx | 4 +- .../tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../tex/latex/biblatex-gost/gost-standard.bbx | 85 ++++++++++++---------- .../tex/latex/biblatex-gost/russian-gost.lbx | 2 +- 24 files changed, 115 insertions(+), 101 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gost') diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx index 674fab19ee5..611c373457b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -15,24 +15,19 @@ systemreq, publication, ipc, - reqnumber, - prnumber, - prcountry, + requestnumber, + prioritynumber, + prioritycountry, + authorcountry, major, majorcode, heading, } -\DeclareDatamodelFields[type=field, datatype=date]{ +\DeclareDatamodelFields[type=field,datatype=date,skipout]{ update, - prdate, - publdate, -} - -\DeclareDatamodelFields[type=field, datatype=integer]{ - upday,upmonth,upyear, - prday,prmonth,pryear, - publday,publmonth,publyear, + prioritydate, + publicationdate, } \DeclareDatamodelFields[type=list, datatype=name]{ @@ -100,16 +95,19 @@ \DeclareDatamodelEntryfields[patent]{ pagetotal, - prday,prmonth,pryear, - publday,publmonth,publyear, - publication,reqnumber,ipc,prnumber,prcountry, + priorityday,prioritymonth,priorityyear, + priorityendday,priorityendmonth,priorityendyear, + publicationday,publicationmonth,publicationyear, + publicationendday,publicationendmonth,publicationendyear, + publication,requestnumber,ipc,prioritynumber,prioritycountry, + authorcountry } \DeclareDatamodelConstraints{ \constraint[type=data, datatype=date]{ \constraintfield{update} - \constraintfield{prdate} - \constraintfield{publdate} + \constraintfield{prioritydate} + \constraintfield{publicationdate} } } diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def index c8c95824675..53fe5745eea 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.def} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -478,12 +478,12 @@ \map{ \pertype{patent} \step[fieldset=options, fieldvalue={useauthor=false}] - \step[fieldsource=authorcountry, fieldtarget=authortype] - \step[fieldsource=requestnumber, fieldtarget=reqnumber] - \step[fieldsource=publicationdate, fieldtarget=publdate] - \step[fieldsource=prioritydate, fieldtarget=prdate] - \step[fieldsource=prioritynumber, fieldtarget=prnumber] - \step[fieldsource=prioritycountry, fieldtarget=prcountry] + \step[fieldsource=authortype, fieldtarget=authorcountry] + \step[fieldsource=reqnumber, fieldtarget=requestnumber] + \step[fieldsource=publdate, fieldtarget=publicationdate] + \step[fieldsource=prdate, fieldtarget=prioritydate] + \step[fieldsource=prnumber, fieldtarget=prioritynumber] + \step[fieldsource=prcountry, fieldtarget=prioritycountry] } } } @@ -499,12 +499,12 @@ \map{ \pertype{patent} \step[fieldset=options, fieldvalue={useauthor=false}] - \step[fieldsource=authorcountry, fieldtarget=authortype] - \step[fieldsource=requestnumber, fieldtarget=reqnumber] - \step[fieldsource=publicationdate, fieldtarget=publdate] - \step[fieldsource=prioritydate, fieldtarget=prdate] - \step[fieldsource=prioritynumber, fieldtarget=prnumber] - \step[fieldsource=prioritycountry, fieldtarget=prcountry] + \step[fieldsource=authortype, fieldtarget=authorcountry] + \step[fieldsource=reqnumber, fieldtarget=requestnumber] + \step[fieldsource=publdate, fieldtarget=publicationdate] + \step[fieldsource=prdate, fieldtarget=prioritydate] + \step[fieldsource=prnumber, fieldtarget=prioritynumber] + \step[fieldsource=prcountry, fieldtarget=prioritycountry] } } } diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx index 6ce8c389104..f5635ea6aea 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-alphabetic} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx index a9f43f5befc..f5ef8f5f26c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{gost-alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx index 9f9f8c3b528..bceb2a5e0ec 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyvt} @@ -10,7 +10,7 @@ \defbibenvironment{bibliography} {\list {\printtext[labelalphawidth]{% - \printfield{prefixnumber}% + \printfield{labelprefix}% \printfield{labelalpha}% \printfield{extraalpha}}} {\setlength{\labelwidth}{\labelalphawidth}% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx index c5534520399..2116ab1006e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{alphabetic} \ExecuteBibliographyOptions{labelalpha,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx index bebdad166b6..fc5311bbc53 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-authoryear} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx index ac61e71c514..4c4258bca53 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{gost-authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx index d54d5615915..a7b97745054 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} @@ -226,8 +226,11 @@ \setlength{\labelauthoryearsep}{\biblabelsep}% } -\ExecuteBibliographyOptions{labeldate,labeltitleyear,sorting=nyt,pagetracker,mergedate=gostletter, - bibisbn,biburl,bibdoi,bibeprint} +\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ + {\ExecuteBibliographyOptions{labeldateparts,labeltitleyear,sorting=nyt,pagetracker,mergedate=gostletter, + bibisbn,biburl,bibdoi,bibeprint}} + {\ExecuteBibliographyOptions{labeldate,labeltitleyear,sorting=nyt,pagetracker,mergedate=gostletter, + bibisbn,biburl,bibdoi,bibeprint}} \DeclareFieldFormat{shorthandwidth}{#1} \setlength{\bibitemsep}{0pt} 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 665bd12bb6e..c5dc01c5688 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx @@ -1,10 +1,15 @@ \ProvidesFile{gost-authoryear.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] -\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, +\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ + {\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, + singletitle=false,labeldateparts,labeltitleyear,uniquename=init, + uniquelist,ibidtracker=constrict,pagetracker,sortcites,autocite=inline, + citeisbn,citeurl,citedoi,citeeprint}} + {\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, singletitle=false,labeldate,labeltitleyear,uniquename=init, uniquelist,ibidtracker=constrict,pagetracker,sortcites,autocite=inline, - citeisbn,citeurl,citedoi,citeeprint} + citeisbn,citeurl,citedoi,citeeprint}} \providecommand*{\mkibid}[1]{#1} \renewcommand*{\iffinalcitedelim}{% @@ -24,9 +29,9 @@ \DeclareFieldFormat*{citetitle}{\mkbibemph{#1}} \DeclareFieldFormat{extratitleyear}{% - \iffieldnums{labelyear} + \iffieldnum{labelyear} {\mknumalph{#1}} - {\printtext{(}\mknumalph{#1}\printtext{)}}} + {\printtext{(\mknumalph{#1})}}} \DeclareFieldFormat{citeheading}{#1} \newbibmacro*{cite:init}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx index 0e991f773aa..0b6e988af39 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline-min} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx index bf8d1995a1b..c445687a67e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{gost-footnote} \renewbibmacro*{cite:clearfields}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx index 9f869e2d56e..c26c965d469 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx index 9f6ac97adaf..8cc082b5482 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{gost-inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx index 2d7648f4fad..73b91d7530d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx index cc6b78912e8..4dc41899a32 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{gost-inline} \renewbibmacro*{cite:clearfields}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx index 831ca18a4c9..25ad089aafa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx @@ -1,10 +1,13 @@ \ProvidesFile{gost-inline.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} -\ExecuteBibliographyOptions{labeldate,sorting=ntvy,pagetracker,dashed=false, - bibisbn,biburl,bibdoi,bibeprint} +\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ + {\ExecuteBibliographyOptions{labeldateparts,sorting=ntvy,pagetracker,dashed=false, + bibisbn,biburl,bibdoi,bibeprint}} + {\ExecuteBibliographyOptions{labeldate,sorting=ntvy,pagetracker,dashed=false, + bibisbn,biburl,bibdoi,bibeprint}} \DeclareFieldFormat{shorthandwidth}{#1} \setlength{\bibitemsep}{0pt} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx index 8f7bf2b1aef..427338ccd56 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx index 3258b5efaf7..108988fc38f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-numeric} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx index ef6935e2c97..686eb14ca19 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{gost-numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx index c36798c7a00..8175f8991fe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.bbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint} @@ -16,7 +16,7 @@ \defbibenvironment{bibliography} {\list {\printtext[labelnumberwidth]{% - \printfield{prefixnumber}% + \printfield{labelprefix}% \printfield{labelnumber}}} {\setlength{\labelwidth}{\labelnumberwidth}% \setlength{\leftmargin}{\labelwidth}% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx index 1f4c7542869..822e4c6482e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.cbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{dashed=false,citeisbn,citeurl,citedoi,citeeprint} 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}% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx index f4dcec1eb6c..7641feeffff 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{russian-gost.lbx} -[2016/07/18\space v1.7\space biblatex-gost styles] +[2016/08/30\space v1.8\space biblatex-gost styles] \InheritBibliographyExtras{russian} -- cgit v1.2.3