From 7a43303309935f005d536764728aeb1639da6ff2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Apr 2016 21:03:13 +0000 Subject: biblatex-gost (10apr16) git-svn-id: svn://tug.org/texlive/trunk@40390 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-gost/biblatex-gost-examples.bib | 11 ++++----- .../latex/biblatex-gost/biblatex-gost-examples.pdf | Bin 620729 -> 620546 bytes .../latex/biblatex-gost/biblatex-gost-examples.tex | 2 +- .../doc/latex/biblatex-gost/biblatex-gost.pdf | Bin 243472 -> 242901 bytes .../doc/latex/biblatex-gost/biblatex-gost.tex | 14 ++++++++++++ .../tex/latex/biblatex-gost/biblatex-gost.dbx | 17 +++++++------- .../tex/latex/biblatex-gost/biblatex-gost.def | 4 +++- .../latex/biblatex-gost/gost-alphabetic-min.bbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.bbx | 2 +- .../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 | 2 +- .../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 +- .../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 | 2 +- .../tex/latex/biblatex-gost/gost-inline.cbx | 4 ++-- .../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 | 2 +- .../tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../tex/latex/biblatex-gost/gost-standard.bbx | 25 ++++++++++++--------- .../tex/latex/biblatex-gost/russian-gost.lbx | 2 +- 29 files changed, 70 insertions(+), 47 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib index 987988f8215..b69c025ceab 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib @@ -729,7 +729,7 @@ language = {russian}, langid = {russian}, _related = {Peirce C. S. Collected Papers. Ed. by C. Hartshorne and P. Weiss; Arthur W. Burks. Vol. 1 - 8. Cambridge - Mass.: The Belknap Press of Harvard University Press, 1965 -1967}, - _relateetype = {translationof}, + _relatedtype = {translationof}, } @BOOK{brentano:msa, ids = {brentano_msa}, @@ -3366,7 +3366,7 @@ ids = {leibniz_s4}, year = {1989}, volume = {4}, - number = {Т.\,109}, + number = {Т. 109}, origlanguage = {french}, pagetotal = {554}, crossref = {leibniz:soch}, @@ -3413,7 +3413,7 @@ ids = {leibniz_s3}, year = {1984}, volume = {3}, - number = {Т.\,92}, + number = {Т. 92}, origlanguage = {french}, pagetotal = {734}, crossref = {leibniz:soch}, @@ -3424,7 +3424,7 @@ ids = {leibniz_s2}, year = {1983}, volume = {2}, - number = {Т.\,87}, + number = {Т. 87}, origlanguage = {french}, pagetotal = {686}, crossref = {leibniz:soch}, @@ -3435,7 +3435,7 @@ ids = {leibniz_s1}, year = {1982}, volume = {1}, - number = {Т.\,84}, + number = {Т. 84}, origlanguage = {french}, pagetotal = {636}, crossref = {leibniz:soch}, @@ -5648,6 +5648,7 @@ @MVBOOK{dosse:hs, author = {Dosse, François}, title = {History of Structuralism}, + date = {1997}, language = {english}, langid = {english}, publisher = {University of Minnesota Press}, diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf index 8ee64bf61d2..b1d2242869e 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf and b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex index ca3b2d5b964..791a29beec5 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex @@ -15,7 +15,7 @@ backend=biber, hyperref=auto, language=auto, - babel=other, + autolang=other, citestyle=gost-numeric, defernumbers=true, bibstyle=gost-footnote, diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf index ab40f2d4fa2..2feee5157ee 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf and b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex index d2f92b76748..052dff43297 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -187,6 +187,12 @@ maintained. точки зрения совместимости с предыдущими версиями. Более полный список изменений см. в \Apxref{apx:changelog}. +\subsubsection*{Версия 1.6} + +\begin{trivlist} +\item Нет критических изменений. +\end{trivlist} + \subsubsection*{Версия 1.5} \begin{trivlist} @@ -2160,6 +2166,14 @@ pageref & + & + & + & + & + & + & + & + \begin{changelog} + \begin{release}{1.6}{05-04-2016} + \item Исправлены ошибки в модели данных (не влияли на вывод). + \item Исправлена ошибка при выводе повторных (сокращённых) ссылок в + \texttt{gost-inline/footnote}. + \item Исправлен макрос \texttt{headingname:family-given} для + работы с \biblatex~3.4. + \end{release} + \begin{release}{1.5a}{17-03-2016} \item Исправлена ошибка вывода имён в \texttt{gost-authoryear} \end{release} 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 0187f32603d..674fab19ee5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -23,7 +23,7 @@ heading, } -\DeclareDatamodelFields[type=field, datatype=date, skipout]{ +\DeclareDatamodelFields[type=field, datatype=date]{ update, prdate, publdate, @@ -57,6 +57,10 @@ } \DeclareDatamodelEntryfields{ + number, + book,part,issue, + books,parts,issues, + language, media, credits, editioncredits, @@ -65,20 +69,16 @@ heading, } -\DeclareDatamodelEntryfields[article]{ +\DeclareDatamodelEntryfields[article,periodical]{ journalcredits, + location, + publisher, } \DeclareDatamodelEntryfields[book,collection,proceedings,reference]{ - book, - books,parts,issues, sortvolume, } -\DeclareDatamodelEntryfields[mvbook,mvcollection,mvproceedings,mvreference]{ - books,parts,issues, -} - \DeclareDatamodelEntryfields[inbook,incollection,inproceedings,inreference,bookinbook,suppbook,suppcollection]{ booktranslator, bookcommentator, @@ -99,6 +99,7 @@ } \DeclareDatamodelEntryfields[patent]{ + pagetotal, prday,prmonth,pryear, publday,publmonth,publyear, publication,reqnumber,ipc,prnumber,prcountry, 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 9f5a6060e7e..31ec66cb8c3 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -527,6 +527,8 @@ {book,collection,proceedings,reference}{% \inherit{shorttitle}{shorttitle}} +\DeclareDataInheritance{article}{periodical}{% + \noinherit{pagetotal}} \DeclareDataInheritance{book}{inbook,bookinbook,suppbook}{% \inherit{translator}{booktranslator} \inherit{introduction}{bookintroduction} 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 6a1baa5dae2..e584fcda6d0 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 dc215bff4e1..4da99dae997 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 9d0cbd27446..47ceb2c8225 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 fcf6d0be255..eafb98d91d4 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 17ac63251dd..5e2ca9c1522 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 76610cb33fa..92e591141b8 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 6768e18d0b0..0b667bfd5de 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 4732d808901..9230a0a76ac 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 fa397a184bb..eddfb900e97 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 d45686d7fd7..5c69013199b 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 a95eca0bedd..d10538b6089 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 bc751089ef4..f75944e295c 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 65b516a9787..8c124a7d29f 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 f799c5b5e17..21962e3a6ce 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 abfd9911084..bef1323380c 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 55ea11512d2..c2b79c733c1 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] @@ -95,7 +95,7 @@ {\def\blx@mincrossrefs{1}} {}} -\DeclareNameAlias{labelname}{author} +\DeclareNameAlias{labelname}{heading} \DeclareFieldFormat*{citetitle}{#1} \renewcommand{\postnotedelim}{\addperiod\space} 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 1d6a3ac8a65..0306b55bbb3 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 51bc30e4c81..b265fb02a1a 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 6adbf46b41b..104b754940c 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 4355d07c39b..a9277f5b2a6 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\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 482b4cfb972..1f48b5ac042 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\space biblatex-gost styles] -\def\bbx@gost@date{2016/03/17} -\def\bbx@gost@version{1.5a} +\def\bbx@gost@date{2016/04/05} +\def\bbx@gost@version{1.6} \@ifpackagelater{biblatex}{2016/03/03} {} @@ -277,21 +277,26 @@ \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% - \ifempty{#3}{}{% + \ifdefvoid{#3}{}{% \ifcapital {\mkbibhdnameprefix{\MakeCapital{#3}}\isdot} {\mkbibhdnameprefix{#3}\isdot}% \ifprefchar{}{\bibnamedelimc}}% \mkbibhdnamefamily{#1}\isdot - \ifempty{#4}{}{\bibnamedelimd\mkbibhdnamesuffix{#4}\isdot}% - \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibhdnamegiven{#2}\isdot}} + \ifdefvoid{#4}{}{\bibnamedelimd\mkbibhdnamesuffix{#4}\isdot}% + \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibhdnamegiven{#2}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% \mkbibhdnamefamily{#1}\isdot - \ifempty{#4}{}{\bibnamedelimd\mkbibhdnamesuffix{#4}\isdot}% - \ifempty{#2#3}{}{\revsdnamepunct}% - \ifempty{#2}{}{\bibnamedelimd\mkbibhdnamegiven{#2}\isdot}% - \ifempty{#3}{}{\bibnamedelimd\mkbibhdnameprefix{#3}\isdot}}} + \ifdefvoid{#4}{}{\bibnamedelimd\mkbibhdnamesuffix{#4}\isdot}% + \ifboolexpe{% + test {\ifdefvoid{#2}} + and + test {\ifdefvoid{#3}}} + {} + {\revsdnamepunct}% + \ifdefvoid{#2}{}{\bibnamedelimd\mkbibhdnamegiven{#2}\isdot}% + \ifdefvoid{#3}{}{\bibnamedelimd\mkbibhdnameprefix{#3}\isdot}}} \newcommand*{\mkgostheading}[1]{\mkbibemph{#1}}%\nocorr}} \DeclareFieldFormat{heading}{% \mkgostheading{#1}\addperiod\space} 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 a5b9afe64d9..95b48be0e71 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/03/17\space v1.5a\space biblatex-gost styles] +[2016/04/05\space v1.6\space biblatex-gost styles] \InheritBibliographyExtras{russian} -- cgit v1.2.3