From f6ada9443961d61bb64a578058cec988b5ca722c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Oct 2020 20:58:23 +0000 Subject: biblatex-gost (26oct20) git-svn-id: svn://tug.org/texlive/trunk@56770 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-gost/biblatex-gost-examples.pdf | Bin 634668 -> 634631 bytes .../doc/latex/biblatex-gost/biblatex-gost.pdf | Bin 291778 -> 292445 bytes .../doc/latex/biblatex-gost/biblatex-gost.tex | 78 +++++++++++++++------ .../tex/latex/biblatex-gost/american-gost.lbx | 2 +- .../tex/latex/biblatex-gost/biblatex-gost.dbx | 2 +- .../tex/latex/biblatex-gost/biblatex-gost.def | 9 +-- .../tex/latex/biblatex-gost/brazilian-gost.lbx | 2 +- .../tex/latex/biblatex-gost/british-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 +- .../tex/latex/biblatex-gost/french-gost.lbx | 2 +- .../tex/latex/biblatex-gost/galician-gost.lbx | 2 +- .../tex/latex/biblatex-gost/german-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 | 17 +++-- .../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 | 2 +- .../tex/latex/biblatex-gost/slovene-gost.lbx | 2 +- .../tex/latex/biblatex-gost/spanish-gost.lbx | 2 +- 52 files changed, 117 insertions(+), 81 deletions(-) (limited to 'Master/texmf-dist') 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 1c6e5eb0555..2df72e6cbd3 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.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf index e8650e5644c..93b9931fafc 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 2b56723ae44..ddd886ddbe0 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -487,10 +487,15 @@ This package is maintained. \bibfield{shorttitle} (о многоточиях при сокращении заголовков см.~\secref{ellipsis}). -По умолчанию стиль устанавливает опции \kvopt{autocite}{inline}, \kvopt{sorting}{ntvy}, - \kvopt{pagetracker}{true}, \kvopt{strict}{true}, \kvopt{citetracker}{constrict}, -\kvopt{opcittracker}{constrict}, \kvopt{citepages}{omit}, -\kvopt{labelyear}{true}. +По умолчанию стиль устанавливает опции \kvopt{autocite}{inline}, % +\kvopt{sorting}{ntvy}, % +\kvopt{pagetracker}{true}, % +\kvopt{strict}{true}, % +\kvopt{citetracker}{constrict}, % +\kvopt{opcittracker}{constrict}, % +\kvopt{citepages}{omit}, % +\kvopt{labeldateparts}{true}, % +\kvopt{labeltitle}{true}. \item[gost-footnote] Подстрочные ссылки. @@ -508,10 +513,15 @@ This package is maintained. там не выводятся поля \bibfield{doi}, \bibfield{eprint}, \bibfield{url}, \bibfield{addendum}, \bibfield{pubstate}. -По умолчанию стиль устанавливает опции \kvopt{autocite}{footnote}, \kvopt{sorting}{ntvy}, -\kvopt{pagetracker}{true}, \kvopt{strict}{true}, \kvopt{citetracker}{constrict}, -\kvopt{opcittracker}{constrict}, \kvopt{citepages}{omit}, -\kvopt{labelyear}{true}. +По умолчанию стиль устанавливает опции \kvopt{autocite}{footnote}, % +\kvopt{sorting}{ntvy}, % +\kvopt{pagetracker}{true}, % +\kvopt{strict}{true}, % +\kvopt{citetracker}{constrict}, % +\kvopt{opcittracker}{constrict}, % +\kvopt{citepages}{omit}, % +\kvopt{labeldateparts}{true}, % +\kvopt{labeltitle}{true}. \item[gost-numeric] Затекстовые ссылки. Основан на стандартном стиле \bibsty{numeric-comp} и отличается @@ -526,7 +536,8 @@ This package is maintained. \renewcommand*{\multicitedelim}{\addsemicolon\space} \end{lstlisting} -По умолчанию стиль устанавливает опции \kvopt{autocite}{inline}, \kvopt{sortcites}{true}. +По умолчанию стиль устанавливает опцию % +% \kvopt{autocite}{inline}, \kvopt{sortcites}{true}. \kvopt{labelnumber}{true}. \item[gost-authoryear] @@ -548,16 +559,25 @@ This package is maintained. имеется лишь одна публикация данного автора или лишь одна публикация без автора с данным названием). -По умолчанию стиль устанавливает опции -\kvopt{autocite}{inline}, -\kvopt{sorting}{nyt}, -\kvopt{pagetracker}{true}, -\kvopt{mergedate}{gostletter}, +По умолчанию стиль устанавливает опции % +\kvopt{autocite}{inline}, % +\kvopt{sorting}{nyt}, % +\kvopt{pagetracker}{true}, % +\kvopt{mergedate}{gostletter}, % \kvopt{dropdates}{false}, (или \opt{true} при \kvopt{mergedate}{goststrict}, -см.~\secref{sec:newoptions}). - -\item[gost-alphabetic] +см.~\secref{sec:newoptions}), % +\kvopt{labeldateparts}{true}, % +\kvopt{citetracker}{constrict}, % +\kvopt{loccittracker}{constrict}, % +\kvopt{dropdates}{false}, % +\kvopt{labeltitleyear}{true}, % +\kvopt{uniquename}{init}, % % +\kvopt{uniquelist}{true}, % +\kvopt{ibidtracker}{constrict}, % +\kvopt{sortcites}{true}. + +\item[gost-alphabetic] % Этот стиль не предусмотрен ГОСТом, но добавлен для полноты. Он соответствует стандартному стилю \bibsty{alphabetic}, а также \bibsty{alphabetic-verb}, если его использовать в виде: @@ -617,11 +637,21 @@ This package is maintained. \starsdelim Дополнительно, все стили по умолчанию устанавливают опции -\kvopt{dashed}{false}, -\kvopt{useeditor}{false}, -\kvopt{usetranslator}{false}, -\kvopt{maxnames}{3}, -\kvopt{minnames}{1}. +\kvopt{dashed}{false}, % +\kvopt{useeditor}{false}, % +\kvopt{usetranslator}{false}, % +\kvopt{maxnames}{3}, % +\kvopt{minnames}{1}, % +\kvopt{dashed}{false}, % +\kvopt{movenames}{true}, % +\kvopt{giveninits}{true}, % +\kvopt{volsorder}{vbpi}, % +\kvopt{related}{true}, % +\kvopt{alldates}{short}, % +\kvopt{eventdate}{comp}, % +\kvopt{blockpunct}{emdash}, % +\kvopt{doublevols}{true}, % +\kvopt{otherlangs}{true}. % Значения по умолчанию для опций \opt{cite\ldots} и \opt{bib\ldots} см. в \tabref{tab:bibcite}. \vspace{.5\baselineskip} @@ -2509,6 +2539,10 @@ pageref & + & + & + & + & + & + & + & + \begin{changelog} + \begin{release}{1.19}{25-10-2020} + \item Добавлен обход для deprecated \cmd{mkrelatedstring}. + \end{release} + \begin{release}{1.18}{23-02-2020} \item Добавлен патч для обхода ошибки \biblatex 3.14. См. подробнее \url{https://github.com/odomanov/biblatex-gost/issues/22}, diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx index 9d8b6281d8e..a7207637661 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{american-gost.lbx} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{american} \InheritBibliographyStrings{american} 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 3c7f3b3c344..c710909b37b 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 21ada061cbd..0aaf4389ec1 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -520,13 +520,10 @@ \entrydata{#1}{% \renewbibmacro*{name:hook}[1]{% \ifnumequal{\value{listcount}}{1} - {\begingroup - \mkrelatedstring% - \lbx@initnamehook{#1}% - \endgroup} + {\mkrelatedstringtext{\lbx@initnamehook{#1}}} {}}% \printnames[bytranslator]{translator}% - \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\space}% + \setunit*{\addspace\bibstring[\mkrelatedstringtext]{astitle}\space}% \usebibmacro{author}% \setunit*{\labelnamepunct}% \usebibmacro{title}% 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 c4052074cbe..0d8fbdc823c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{brazilian} \InheritBibliographyStrings{brazilian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx index d235ceaa6ca..586af50de87 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{british-gost.lbx} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{british} \InheritBibliographyStrings{british} 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 57e4a5774b5..c5d83b553f2 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{catalan} \InheritBibliographyStrings{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 4be26313114..271e423fcce 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{croatian} \InheritBibliographyStrings{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 4b2f9284330..381bf677c98 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{english-gost.lbx} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{english} \InheritBibliographyStrings{english} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx index 1cd2477f32c..a5c6524e615 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{french-gost.lbx} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{french} \InheritBibliographyStrings{french} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx index 24d423937c6..4bcd22a3223 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{galician-gost.lbx} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{galician} \InheritBibliographyStrings{galician} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx index 5060e354574..0a9c7efd847 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{german-gost.lbx} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{german} \InheritBibliographyStrings{german} 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 afb0c782eff..4248d447201 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 7779c2e34ad..b82670552ea 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 f2fe4543fac..1ccbe7ce3e0 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 b220e27f934..ff92a99d29c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 d6ebfe597b1..77aa8f5a92c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 61039e80a43..c1f95f4a752 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 542d584d444..7b390ffe759 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 b49f13dd787..76da8fd244c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 91773b53518..50841a9fba3 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 849e83fd6b8..3326eca938e 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 42cc0038863..f3925e64738 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 1c85e127a16..813c788163e 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 c84cd3b3797..4de83c4f597 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 5dfdcff83ae..ac99c6c51df 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 7755432e02f..175a01a3164 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 0845dd95a48..ebdae552a21 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 a84aba835c4..d3a6e987747 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 2d840913b9a..8e192490a9e 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 a27ac3bad91..a627604418c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 c4a9c94dc7f..bd6e2387f78 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 746c27a6c7f..68b24367a8c 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 2d453964496..483303ab48c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 9521e93d640..6ecc9b91d1d 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 98250941e18..be249bd3004 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 d3d2c750b83..f87f542cd69 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 c041821c471..d36549a545e 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 0e9f2779da0..256c87eda43 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 26dc8db11c0..1c23b7b8d93 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 7f31a0858f9..d7a0ae6af27 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\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 b010d659a75..6d4a1724436 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} -[2020/02/23\space v1.18\space biblatex-gost data model] +[2020/10/25\space v1.19\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 befce113ae1..2d92933cfa5 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] -\def\bbx@gost@date{2020/02/23} -\def\bbx@gost@version{1.18} +\def\bbx@gost@date{2020/10/25} +\def\bbx@gost@version{1.19} \@ifpackagelater{biblatex}{2019/09/01} {} @@ -35,6 +35,10 @@ \RequireBiber[3] % strictly required +% workaround for the \mkrelatedstring deprecation. +% https://github.com/odomanov/biblatex-gost/issues/27 +\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}} + \blx@inputonce{biblatex-gost.def}{biblatex-gost generic definitions}{}{}{}{} \newtoggle{bbx:isbn} @@ -535,6 +539,7 @@ % clear \newblock in citations, not in biblists \AtUsedriver*{% + \delimcontext{bib}% \ifcitation{\let\newblock\relax}{}% \let\finentry\blx@finentry@usedrv \let\abx@macro@bibindex\@empty @@ -2468,14 +2473,14 @@ test {\ifbibxstring{\thefield{relatedtype}s}} } {\printtext[\bbx@tempb]{% - \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}} + \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}s}}} {\iffieldbibstring{relatedtype} {\printtext[\bbx@tempb]{% - \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}} + \bibstring[\mkrelatedstringtext]{\thefield{relatedtype}}}} {}}} {\iffieldbibstring{relatedstring} {\printtext[\bbx@tempb]{% - \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}} + \bibstring[\mkrelatedstringtext]{\thefield{relatedstring}}}} {\printfield[\bbx@tempb]{relatedstring}}}% \docsvfield{related}% \usebibmacro{endrelatedloop}}}% 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 c760f0643cc..106978a9697 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{greek} \InheritBibliographyStrings{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 19e640fb060..1b3c4ae4928 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{icelandic} \InheritBibliographyStrings{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 0ef978a4775..43795ac9d09 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{italian} \InheritBibliographyStrings{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 7d49f2e285e..a25f644b72d 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{portuguese} \InheritBibliographyStrings{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 89ec537b3b3..355db49ad53 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{russian} 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 4f9f1f089d2..d7e987cec6b 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{slovene} \InheritBibliographyStrings{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 1c7c6b203d6..dc9e62ae67c 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} -[2020/02/23\space v1.18\space biblatex-gost styles] +[2020/10/25\space v1.19\space biblatex-gost styles] \InheritBibliographyExtras{spanish} \InheritBibliographyStrings{spanish} -- cgit v1.2.3