From 6320e3d204852732e5510f2b0cdd5022fc541091 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 27 Jun 2017 21:56:10 +0000 Subject: biblatex-gost (27jun17) git-svn-id: svn://tug.org/texlive/trunk@44712 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-gost/biblatex-gost.dbx | 2 +- .../tex/latex/biblatex-gost/biblatex-gost.def | 3 +- .../tex/latex/biblatex-gost/brazilian-gost.lbx | 2 +- .../tex/latex/biblatex-gost/catalan-gost.lbx | 2 +- .../tex/latex/biblatex-gost/croatian-gost.lbx | 2 +- .../tex/latex/biblatex-gost/english-gost.lbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.bbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.cbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.bbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.cbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.dbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.bbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.cbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.bbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.cbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.dbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.cbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.dbx | 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-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-inline.bbx | 2 +- .../tex/latex/biblatex-gost/gost-inline.cbx | 2 +- .../tex/latex/biblatex-gost/gost-inline.dbx | 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-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.dbx | 2 +- .../tex/latex/biblatex-gost/gost-standard.bbx | 105 ++++++++++----------- .../tex/latex/biblatex-gost/greek-gost.lbx | 2 +- .../tex/latex/biblatex-gost/icelandic-gost.lbx | 2 +- .../tex/latex/biblatex-gost/italian-gost.lbx | 2 +- .../tex/latex/biblatex-gost/portuguese-gost.lbx | 2 +- .../tex/latex/biblatex-gost/russian-gost.lbx | 3 +- .../tex/latex/biblatex-gost/slovene-gost.lbx | 2 +- .../tex/latex/biblatex-gost/spanish-gost.lbx | 2 +- 44 files changed, 93 insertions(+), 100 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 faccdea6735..5aa08abe8f8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] % Biblatex-GOST data model 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 8aea276d7db..7ba6248442c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def @@ -1,11 +1,12 @@ \ProvidesFile{biblatex-gost.def} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ involumes, geneditor, geneditors, + bypreparation, bygeneditor, bygeneditortr, bygeneditorco, diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx index c1ec9aa4f5e..90191c08884 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{brazilian-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{brazilian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx index da2671f59e9..116933792c7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{catalan-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{catalan} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx index 2dfe8f0f057..18c7fe2e0ae 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{croatian-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{croatian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx index 260125e10cd..3c9050f6b1b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{russian-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{english} 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 d97a639f623..b339a07bb6b 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 2d9518ef7f1..14ef7f91475 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{gost-alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx index b50fde99b86..62490d7dac6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 e0de0a7f955..caa9033bef4 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 e2ac53d56cd..857e3a92b3a 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{alphabetic} \ExecuteBibliographyOptions{labelalpha,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx index b4f744d629f..fe60c9488b4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 aa26446ddf7..0c002bf9847 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 880b2b81687..ff61f0798b0 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{gost-authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx index 5001c336781..ec5a5d294f0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 31e0a03c54e..8ddd8235e43 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 b5796b2b0db..5be83c078e2 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/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, dropdates=false, diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx index fd8781d1a2d..8881e3cc713 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 77611909d76..a3c82aa89be 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 f76c9490b40..2d641f5ccb3 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{gost-footnote} \renewbibmacro*{cite:clearfields}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx index 84654332317..a11ed9ae485 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 63f6431da08..21b41c0af13 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 cea225b581d..222fecdb43a 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{gost-inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx index ba58cfdeb29..3274e31825e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 d5e7e5465af..e8839af25b2 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 ba62e982f35..359bfb4b858 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{gost-inline} \renewbibmacro*{cite:clearfields}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx index 8f0a605321b..56925335df9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 8ff7fb12c30..6d837ecef79 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 e998e1e3d52..1173d52540a 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx index 47d2905969d..60fda625713 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 90bfa3d3294..996b297fd9e 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 08d262602bd..e85107304e6 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \RequireCitationStyle{gost-numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx index 93ea3d3713d..b521862cbce 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 57f86a65254..e6171809954 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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 71f5cddde06..f297a294c91 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\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-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx index 0512e72d844..0038a7bef87 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.dbx} -[2017/05/03\space v1.14\space biblatex-gost data model] +[2017/06/27\space v1.15\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} 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 e5a48f92f65..69182291aaf 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] -\def\bbx@gost@date{2017/05/03} -\def\bbx@gost@version{1.14} +\def\bbx@gost@date{2017/06/27} +\def\bbx@gost@version{1.15} \@ifpackagelater{biblatex}{2016/09/07} {} @@ -483,7 +483,7 @@ \renewcommand*{\finalnamedelim}{\addcomma\space} \renewcommand*{\finallistdelim}{\addcomma\space} \renewcommand*{\bibpagespunct}{\addperiod\space} -\renewcommand*{\subtitlepunct}{\addcolon\space} +\renewcommand*{\subtitlepunct}{\addcolondelim} \newcommand*{\respdelim}{\addnbspace/\space}% delimiter before "credits" \newcommand*{\resppunct}{\addsemicolondelim}% between "credits" items \newcommand*{\specialitydelim}{\addnbspace\textemdash\space}% between specialitycode and speciality @@ -523,7 +523,10 @@ \newcommand*{\blx@gost@iflangundef}[3]{\iffieldundef{#1}{#2}{#3}} \newcommand*{\blx@gost@iflangsequal}[4]{\iffieldsequal{#1}{#2}{#3}{#4}} -\newbibmacro*{begentry}{} +\newbibmacro*{begentry}{% + \csundef{savedclearedcredits}% + \csundef{savedclearededitor}% + \csundef{savedclearedtranslator}} \newbibmacro*{finentry}{\finentry} % %----------- Drivers ---------------- @@ -593,8 +596,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{book}{% @@ -638,8 +640,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{booklet}{% @@ -677,8 +678,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{collection}{% @@ -720,8 +720,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{inbook}{% @@ -786,8 +785,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{incollection}{% @@ -850,8 +848,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{inproceedings}{% @@ -914,8 +911,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{manual}{% @@ -965,8 +961,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{misc}{% @@ -1000,8 +995,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{online}{% @@ -1044,8 +1038,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{patent}{% @@ -1107,8 +1100,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{periodical}{% @@ -1146,8 +1138,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{proceedings}{% @@ -1189,8 +1180,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{report}{% @@ -1235,8 +1225,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{thesis}{% @@ -1267,8 +1256,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{unpublished}{% @@ -1300,8 +1288,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related:init}% - \usebibmacro{related}% + \usebibmacro{relatedblock}% \usebibmacro{finentry}} \DeclareBibliographyDriver{shorthand}{% @@ -2028,8 +2015,10 @@ \usebibmacro{media}% \setunit*{\addcolondelim}}% \printfield[titlecase]{subtitle}}% + \midsentence \setunit*{\addcolondelim}% \printfield{type}% + \midsentence \setunit*{\addcolondelim}% \printfield{specialitycode}% \setunit*{\specialitydelim}% @@ -2373,6 +2362,8 @@ \newbibmacro*{begrelated}{} \newbibmacro*{endrelated}{} +\newbibmacro*{begrelatedloop}{} +\newbibmacro*{endrelatedloop}{} \def\ifrelatedloop{% \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}} @@ -2385,23 +2376,10 @@ \iffieldequalstr{relatedtype}{multivolume} {\finentry} {}% - \ifboolexpr{ - ( test {\ifcitation} - and - not togl {bbx:related:cite} - ) - or - ( not test {\ifcitation} - and - not togl {bbx:related:bib} - ) - or - test {\iffieldundef{related}} - or - test {\ifrelatedloop} - } + \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} } {} - {\def\bbx@tempa{}% + {\usebibmacro{begrelated}% + \def\bbx@tempa{}% \setcounter{bbx:relatedtotal}{0}% \def\do##1{% \entrydata{##1}{% @@ -2420,7 +2398,9 @@ \def\do{% \stepcounter{bbx:relatedcount}% \ifnumgreater{\value{bbx:relatedcount}}{1} - {\printtext{\relateddelim}} + {\ifcsundef{relateddelim\strfield{relatedtype}} + {\printtext{\relateddelim}} + {\printtext{\csuse{relateddelim\strfield{relatedtype}}}}} {}}% \ifbibmacroundef{related:\strfield{relatedtype}} {\appto{\do}{\usebibmacro{related:default}}} @@ -2432,7 +2412,7 @@ {\def\bbx@tempb{relatedstring:default}} {\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}% \printtext[\bbx@tempa]{% - \usebibmacro{begrelated}% + \usebibmacro{begrelatedloop}% \iffieldundef{relatedstring} {\ifboolexpr{ test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} @@ -2450,8 +2430,19 @@ \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}} {\printfield[\bbx@tempb]{relatedstring}}}% \docsvfield{related}% - \usebibmacro{endrelated}}}% - {}}} + \usebibmacro{endrelatedloop}}}% + {}% + \usebibmacro{endrelated}}} + +\newbibmacro*{relatedblock}{% + \ifboolexpr{ + ( test {\ifcitation} and togl {bbx:related:cite}) + or + ( not test {\ifcitation} and togl {bbx:related:bib}) + } + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}} \newbibmacro*{setup:min}{% \renewbibmacro*{series+number}{}% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx index 14b9e8e991e..c6aa28a4b38 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{greek-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{greek} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx index 6f6807dc560..cdc0f0b9b81 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{icelandic-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{icelandic} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx index 855fc77e596..1dfaecd349c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{italian-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{italian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx index c5cb0771beb..d6728056e5f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{portuguese-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{portuguese} 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 263379f93cd..7bef8722bfe 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} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{russian} @@ -26,6 +26,7 @@ books = {{кн\adddot}{кн\adddot}}, parts = {{ч\adddot}{ч\adddot}}, issues = {{вып\adddot}{вып\adddot}}, + bypreparation = {{в подготовке}{в\addabbrvspace подг\adddot}}, geneditor = {{общий редактор}{общ\adddotspace ред\adddot}}, geneditors = {{общие редакторы}{общ\adddotspace ред\adddot}}, bygeneditor = {{под общей редакцией}{под общ\adddotspace ред\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx index aa27298338e..9b5c4c6be0e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{slovene-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{slovene} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx index c8d969f94f0..42fe0d14bea 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{spanish-gost.lbx} -[2017/05/03\space v1.14\space biblatex-gost styles] +[2017/06/27\space v1.15\space biblatex-gost styles] \InheritBibliographyExtras{spanish} -- cgit v1.2.3