From 413c087ced3433049aab7d00f093b1ee05d1a1b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Jul 2016 22:26:07 +0000 Subject: biblatex-gost (19jul16) git-svn-id: svn://tug.org/texlive/trunk@41730 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def | 14 +++++++++++++- .../tex/latex/biblatex-gost/gost-alphabetic-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic-min.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear-min.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx | 2 +- Master/texmf-dist/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 +- Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx | 8 ++++---- Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx | 2 +- 23 files changed, 38 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gost') 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 31ec66cb8c3..c8c95824675 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -478,6 +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] } } } @@ -493,6 +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] } } } 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 e584fcda6d0..6ce8c389104 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 4da99dae997..a9f43f5befc 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 47ceb2c8225..9f9f8c3b528 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyvt} 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 eafb98d91d4..c5534520399 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 5e2ca9c1522..bebdad166b6 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 92e591141b8..ac61e71c514 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 0b667bfd5de..d54d5615915 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} 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 9230a0a76ac..665bd12bb6e 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} -[2016/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, singletitle=false,labeldate,labeltitleyear,uniquename=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 eddfb900e97..0e991f773aa 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 5c69013199b..bf8d1995a1b 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 d10538b6089..9f869e2d56e 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 f75944e295c..9f6ac97adaf 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 8c124a7d29f..2d7648f4fad 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 21962e3a6ce..cc6b78912e8 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 bef1323380c..831ca18a4c9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.bbx} -[2016/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} 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 c2b79c733c1..8f7bf2b1aef 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 0306b55bbb3..3258b5efaf7 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 b265fb02a1a..ef6935e2c97 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 104b754940c..c36798c7a00 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint} 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 a9277f5b2a6..1f4c7542869 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\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 1f48b5ac042..bca599a2ab6 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] -\def\bbx@gost@date{2016/04/05} -\def\bbx@gost@version{1.6} +\def\bbx@gost@date{2016/07/18} +\def\bbx@gost@version{1.7} \@ifpackagelater{biblatex}{2016/03/03} {} @@ -1569,7 +1569,7 @@ % book:... macros \newbibmacro*{book:credits}{% - \iflistundef{credits} + \iflistundef{bookcredits} {} {\setrespdelim% \printlist[semicolondelim]{bookcredits}% 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 95b48be0e71..f4dcec1eb6c 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/04/05\space v1.6\space biblatex-gost styles] +[2016/07/18\space v1.7\space biblatex-gost styles] \InheritBibliographyExtras{russian} -- cgit v1.2.3