diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
34 files changed, 184 insertions, 128 deletions
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 611c373457b..a3a08302a58 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -1,3 +1,6 @@ +\ProvidesFile{biblatex-gost.dbx} +[2017/01/27\space v1.11\space biblatex-gost data model] + % Biblatex-GOST data model \DeclareDatamodelFields[type=field, datatype=range]{ 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 e4ddb01d795..84901d3288d 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -79,6 +79,7 @@ bygecompilertranin, bygecompilertranfo, bygecompilertranaf, + byeditorcollaborator, books, parts, issues, @@ -430,87 +431,6 @@ } } -\DeclareBibliographyOption{movenames}[true]{% - \gdef\blx@opt@movenames{#1}% - \ifstrequal{#1}{true} - {\DeclareStyleSourcemap{ - \maps[datatype=bibtex]{ - \map[overwrite]{ - \step[fieldsource=author, - match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, - final] - \step[fieldsource=options, - match=\regexp{(.+)}, - replace=\regexp{useauthor=false,$1}] - \step[fieldsource=options, - match=\regexp{^$}, - replace=\regexp{useauthor=false}] - } - \map{ - \step[fieldsource=author, - match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, - final] - \step[fieldset=options, fieldvalue={useauthor=false}] - } - \map[overwrite]{ - \step[fieldsource=editor, - match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, - final] - \step[fieldsource=options, - match=\regexp{(.+)}, - replace=\regexp{useeditor=false,$1}] - \step[fieldsource=options, - match=\regexp{^$}, - replace=\regexp{useeditor=false}] - } - \map{ - \step[fieldsource=editor, - match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, - final] - \step[fieldset=options, fieldvalue={useeditor=false}] - } - \map[overwrite]{ - \pertype{patent} - \step[fieldsource=options, final] - \step[fieldset=options, fieldvalue={useauthor=false,}] - \step[fieldset=options, origfieldval, append] - } - \map{ - \pertype{patent} - \step[fieldset=options, fieldvalue={useauthor=false}] - \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] - } - } - } - } - {\DeclareStyleSourcemap{ - \maps[datatype=bibtex]{ - \map[overwrite]{ - \pertype{patent} - \step[fieldsource=options, final] - \step[fieldset=options, fieldvalue={useauthor=false,}] - \step[fieldset=options, origfieldval, append] - } - \map{ - \pertype{patent} - \step[fieldset=options, fieldvalue={useauthor=false}] - \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] - } - } - } - } -} - \DeclareSortExclusion{inbook,incollection,inproceeding,bookinbook,suppbook,suppcollection,inreference} {editor,volume,maintitle} 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 c64d29f7ad7..846a58bc843 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 cc5462e5644..e6e864f1256 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..297e23c20f7 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,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-alphabetic-min.dbx} +[2017/01/27\space v1.11\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 cbc74cbe3bb..cd8248a5c56 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 95964ea502a..f25f60f7f21 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..c2c696b86a6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx @@ -1,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-alphabetic.dbx} +[2017/01/27\space v1.11\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 cdb62e8f490..25f40c9bdf3 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 24d1f609372..0aab283bbd9 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..2bc0b3eb0f2 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,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-authoryear-min.dbx} +[2017/01/27\space v1.11\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 bb70dc54818..e7355a9b763 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 bc59cf32bca..d74d560b95d 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..1551e52520c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx @@ -1,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-authoryear.dbx} +[2017/01/27\space v1.11\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 e606882b44e..0788c1affeb 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 89e780966d5..a9229f64b41 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..211611b3bdd 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,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-footnote-min.dbx} +[2017/01/27\space v1.11\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 d660488e978..deccac0dd3d 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 8533babd4b1..acbe73fdd26 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..0a9d5493118 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx @@ -1,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-footnote.dbx} +[2017/01/27\space v1.11\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 536add942fa..11b92f6fed4 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 7c34d1c4205..310151f2020 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..6f7dcd3f9a0 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,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-inline-min.dbx} +[2017/01/27\space v1.11\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 c63ffbb9c5a..5fb9ba682d4 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e6c9a264a11..265acee8776 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..0005f4f1776 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx @@ -1,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-inline.dbx} +[2017/01/27\space v1.11\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 ee32a927dd5..d866a557d7e 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 918368fa249..c76b5c9aebd 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..9d49ae673a1 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,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-numeric-min.dbx} +[2017/01/27\space v1.11\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 5661580825e..dd9169f28c9 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 4984c25405c..76454b847cc 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\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 e901d2d9068..b311a6aaaa2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx @@ -1,4 +1,5 @@ -% Biblatex-GOST data model +\ProvidesFile{gost-numeric.dbx} +[2017/01/27\space v1.11\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 5cfcfb3bf40..8c5ae06648a 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\space biblatex-gost styles] -\def\bbx@gost@date{2016/09/18} -\def\bbx@gost@version{1.10} +\def\bbx@gost@date{2017/01/27} +\def\bbx@gost@version{1.11} \@ifpackagelater{biblatex}{2016/03/03} {} @@ -54,6 +54,14 @@ \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} {\renewbibmacro*{bbx:savehash}{}}} +% block punctuation = emdash / space +% \bibsentence is for vol,etc. +\DeclareBibliographyOption{blockpunct}[emdash]{% + \ifstrequal{#1}{emdash} + {\renewcommand*{\newblockpunct}{\addperiod\addnbspace\textemdash\space\bibsentence}} + {\renewcommand*{\newblockpunct}{\addperiod\space\bibsentence}} +} + \DeclareBibliographyOption{isbn}[true]{% \global\settoggle{bbx:isbn}{#1}% \global\settoggle{cbx:isbn}{#1}} @@ -109,6 +117,117 @@ \DeclareBibliographyOption{volsorder}[vbpi]{% \renewcommand*{\blx@gost@defaultorder}{#1}} +\DeclareBibliographyOption{movenames}[true]{% + \gdef\blx@opt@movenames{#1}} + +\AtEndOfPackage{% + \ifdefstring{\blx@opt@movenames}{true} + {\DeclareStyleSourcemap{ + \maps[datatype=bibtex]{ + \map[overwrite]{ + \step[fieldsource=author, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, + final] + \step[fieldsource=options, + match=\regexp{(.+)}, + replace=\regexp{useauthor=false,$1}] + \step[fieldsource=options, + match=\regexp{^$}, + replace=\regexp{useauthor=false}] + } + \map{ + \step[fieldsource=author, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, + final] + \step[fieldset=options, fieldvalue={useauthor=false}] + } + \map[overwrite]{ + \step[fieldsource=editor, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, + final] + \step[fieldsource=options, + match=\regexp{(.+)}, + replace=\regexp{useeditor=false,$1}] + \step[fieldsource=options, + match=\regexp{^$}, + replace=\regexp{useeditor=false}] + } + \map{ + \step[fieldsource=editor, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, + final] + \step[fieldset=options, fieldvalue={useeditor=false}] + } + \map{ + \step[typesource=candthesis,typetarget=thesis, final] + \step[fieldset=type, fieldvalue=phdthesis] + } + \map{ + \step[typesource=docthesis, typetarget=thesis, final] + \step[fieldset=type, fieldvalue=docthesis] + } + \map[overwrite]{ + \pertype{patent} + \step[fieldsource=options, final] + \step[fieldset=options, fieldvalue={useauthor=false,}] + \step[fieldset=options, origfieldval, append] + } + \map{ + \pertype{patent} + \step[fieldset=options, fieldvalue={useauthor=false}] + \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] + } + \map{ + \pertype{thesis} + \step[fieldsource=speciality, fieldtarget=major] + \step[fieldsource=specialitycode, fieldtarget=majorcode] + \step[fieldsource=number, fieldtarget=majorcode] + } + } + } + } + {\DeclareStyleSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[typesource=candthesis,typetarget=thesis, final] + \step[fieldset=type, fieldvalue=phdthesis] + } + \map{ + \step[typesource=docthesis, typetarget=thesis, final] + \step[fieldset=type, fieldvalue=docthesis] + } + \map[overwrite]{ + \pertype{patent} + \step[fieldsource=options, final] + \step[fieldset=options, fieldvalue={useauthor=false,}] + \step[fieldset=options, origfieldval, append] + } + \map{ + \pertype{patent} + \step[fieldset=options, fieldvalue={useauthor=false}] + \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] + } + \map{ + \pertype{thesis} + \step[fieldsource=speciality, fieldtarget=major] + \step[fieldsource=specialitycode, fieldtarget=majorcode] + \step[fieldsource=number, fieldtarget=majorcode] + } + } + } + } + } + \ExecuteBibliographyOptions{ useeditor=false, usetranslator=false, @@ -120,7 +239,8 @@ volsorder=vbpi, related=true, alldates=short, - eventdate=comp} + eventdate=comp, + blockpunct=emdash} \newbibmacro*{cbx:bookibid:check}[2]{#2} @@ -241,7 +361,11 @@ \iffieldnum{edition} {\mkbibordedition{#1}\addnbspace\bibstring{edition}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} -\DeclareFieldFormat[thesis]{type}{\ifbibstring{#1}{\bibsentence\biblstring{#1}}{#1}} +\DeclareFieldFormat[thesis]{type}{% + \ifbibstring{#1}{\biblstring{#1}% + \setunit*{\addspace}% + \printfield{major}}% + {#1}} \DeclareFieldFormat{prioritycountry}{% \ifbibxstring{\thefield{prioritycountry}} {\bibcpstring{\thefield{prioritycountry}}} @@ -318,14 +442,12 @@ \newbibmacro*{//}{% \nopunct\printtext{\addnbspace\mbox{//}\addspace}} -\renewcommand*{\labelnamepunct}{\addspace} +\renewcommand*{\labelnamepunct}{\addperiod\space} \renewcommand*{\intitlepunct}{\addspace} \renewcommand*{\finalnamedelim}{\addcomma\space} \renewcommand*{\finallistdelim}{\addcomma\space} \renewcommand*{\bibpagespunct}{\addperiod\space} \renewcommand*{\subtitlepunct}{\addcolon\space} -\renewcommand*{\newblockpunct}{% - \addperiod\addnbspace\textemdash\space\bibsentence}%block punct.,\bibsentence is for vol,etc. \newcommand*{\respdelim}{\addnbspace/\space}% delimiter before "credits" \newcommand*{\resppunct}{\addsemicolondelim}% punctuation between "credits" items @@ -1087,8 +1209,11 @@ \usebibmacro{author}% \setunit*{\labelnamepunct}% \usebibmacro{thesistitle}% - \setunit{\respdelim}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- + \setrespdelim% \printnames[family-given:full]{author}% + \setunit*{\resppunct}% + \usebibmacro{credits}% \newunit\newblock \printlist[semicolondelim]{specdata}% \newunit @@ -1864,12 +1989,9 @@ {\setunit*{\addspace}% \usebibmacro{media}% \setunit*{\addcolondelim}}% - \printfield[titlecase]{subtitle}}% - \ifbibxstring{\thefield{type}} - {\bibstring{\thefield{type}}} - {\printfield{type}}% - \setunit*{\addspace}% - \printfield{major}% + \printfield[titlecase]{subtitle}}% + \setunit*{\addcolondelim}% + \printfield{type}% \setunit*{\addcolondelim}% \printfield{majorcode}}% \setunit*{\addcolondelim}% 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 95681fe2326..7ed7f6f966f 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/09/18\space v1.10\space biblatex-gost styles] +[2017/01/27\space v1.11\space biblatex-gost styles] \InheritBibliographyExtras{russian} @@ -170,6 +170,7 @@ {сост.,\addabbrvspace пер\adddot\ \lbx@sfromlang, примеч\adddotspace и предисл\adddot}}, bycompilertranaf= {{составление, перевод \lbx@lfromlang, примечания и послесловие}% {сост.,\addabbrvspace пер\adddot\ \lbx@sfromlang, примеч\adddotspace и послесл\adddot}}, + byeditorcollaborator= {{при редакторском участии}{при ред. уч\adddot}}, mediavideorecording = {{видеозапись}{видеозапись}}, mediasoundrecording = {{звукозапись}{звукозапись}}, mediagraphic = {{изоматериал}{изоматериал}}, |