diff options
28 files changed, 548 insertions, 303 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 92ff57b7dd4..993641f3e6c 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 @@ -1390,6 +1390,7 @@ @Collection{if1, crossref = {if}, + xdata = {if-common}, volume = {№ 1}, sorttitle = {История философии 01}, credits = {Ред. Г. М. Тавризян}, @@ -1400,6 +1401,7 @@ @Collection{if2, crossref = {if}, + xdata = {if-common}, volume = {№ 2}, sorttitle = {История философии 02}, credits = {Ред. М. Н. Громов, А. В. Панибратцев}, @@ -1410,6 +1412,7 @@ @Collection{if3, crossref = {if}, + xdata = {if-common}, volume = {№ 3}, sorttitle = {История философии 03}, credits = {Ред. В. А. Жучков}, @@ -1420,6 +1423,7 @@ @Collection{if4, crossref = {if}, + xdata = {if-common}, volume = {№ 4}, sorttitle = {История философии 04}, credits = {Отв. ред. М. Н. Громов, А. В. Панибратцев}, @@ -1430,6 +1434,7 @@ @Collection{if5, crossref = {if}, + xdata = {if-common}, volume = {№ 5}, sorttitle = {История философии 05}, credits = {Ред. И. А. Михайлов}, @@ -1440,6 +1445,7 @@ @Collection{if6, crossref = {if}, + xdata = {if-common}, volume = {№ 6}, sorttitle = {История философии 06}, credits = {Ред. И. А. Михайлов}, @@ -1450,6 +1456,7 @@ @Collection{if7, crossref = {if}, + xdata = {if-common}, volume = {№ 7}, sorttitle = {История философии 07}, credits = {Ред. В. Г. Лысенко}, @@ -1460,6 +1467,7 @@ @Collection{if8, crossref = {if}, + xdata = {if-common}, volume = {№ 8}, sorttitle = {История философии 08}, credits = {Отв. ред. А. М. Руткевич, И. А. Михайлов}, @@ -1470,6 +1478,7 @@ @Collection{if9, crossref = {if}, + xdata = {if-common}, volume = {№ 9}, sorttitle = {История философии 09}, credits = {Отв. ред. С. И. Бажов}, @@ -1480,6 +1489,7 @@ @Collection{if10, crossref = {if}, + xdata = {if-common}, volume = {№ 10}, sorttitle = {История философии 10}, credits = {Отв. ред. В. В. Старовойтов}, @@ -1490,6 +1500,7 @@ @Collection{if11, crossref = {if}, + xdata = {if-common}, volume = {№ 11}, sorttitle = {История философии 11}, credits = {Отв. ред. В. Г. Лысенко}, @@ -1500,6 +1511,7 @@ @Collection{if12, crossref = {if}, + xdata = {if-common}, volume = {№ 12}, sorttitle = {История философии 12}, credits = {Отв. ред. Т. А. Дмитриев}, @@ -1510,6 +1522,7 @@ @Collection{if13, crossref = {if}, + xdata = {if-common}, volume = {№ 13}, sorttitle = {История философии 13}, credits = {Отв. ред. И. И. Блауберг}, @@ -1520,6 +1533,7 @@ @Collection{if14, crossref = {if}, + xdata = {if-common}, volume = {№ 14}, sorttitle = {История философии 14}, credits = {Отв. ред. А. В. Никитин}, @@ -2716,6 +2730,8 @@ title = {Слово о Левинасе}, pages = {10--17}, crossref = {levinas:vd-gdc}, + language = {russian}, + langid = {russian}, } @InCollection{guseinov:zp, @@ -3017,6 +3033,8 @@ title = {Влечения и их судьба}, pages = {125--150}, crossref = {freud:opt}, + language = {russian}, + langid = {russian}, } @InBook{freud:vyt-07, @@ -3144,6 +3162,8 @@ title = {Время и бытие}, pages = {391--406}, crossref = {heidegger:vb-book}, + language = {russian}, + langid = {russian}, } @InBook{heidegger:vb1991, @@ -3152,6 +3172,8 @@ pages = {80--101}, translator = {А. С. Солодовниковой}, crossref = {heidegger:rpd}, + language = {russian}, + langid = {russian}, } @InBook{heidegger:vctm, @@ -3279,6 +3301,8 @@ title = {Торможение, симптом, тревога}, pages = {151--228}, crossref = {freud:vn}, + language = {russian}, + langid = {russian}, } @InBook{freud:vyt-98, @@ -3295,6 +3319,8 @@ title = {Жуткое}, pages = {349--389}, crossref = {freud:ip}, + language = {russian}, + langid = {russian}, } @BookInBook{levinas:gdc1999, @@ -3302,6 +3328,7 @@ title = {Гуманизм другого человека}, pages = {120--258}, crossref = {levinas:vd-gdc}, + langid = {russian}, } @BookInBook{levinas:vd1999, @@ -3309,6 +3336,7 @@ title = {Время и Другой}, pages = {18--119}, crossref = {levinas:vd-gdc}, + langid = {russian}, } @Book{nietzsche:vv, @@ -7005,7 +7033,7 @@ origyear = 1904, origlanguage = {english}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Book{dewey:oep, @@ -7671,7 +7699,9 @@ title = {Процесс и реальность}, year = 1990, pages = {272--303}, - annote = {только отрывки} + annote = {только отрывки}, + language = {russian}, + langid = {russian}, } @Book{whitehead:icp, @@ -8012,7 +8042,7 @@ pagetotal = 215, addendum = {Библиогр.: с. 202---213.~--- 04200201565}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Thesis{vishnyakov:thesis, @@ -8029,7 +8059,7 @@ pagetotal = 234, addendum = {Библиогр.: с. 220---230.~--- 04200204433}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Thesis{Skvortsov:2008, @@ -8045,14 +8075,14 @@ pagetotal = 224, location = {Черноголовка}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Thesis{Skvortsov:2008autoref, crossref = {Skvortsov:2008}, type = {docautoref}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Patent{patent1h, @@ -8071,7 +8101,7 @@ publdate = {2002-08-20}, pagetotal = {2 с.~: ил.}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Patent{patent2h, @@ -8095,7 +8125,7 @@ prcountry = {countryus}, pagetotal = {5 с.~: ил.}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Patent{patent3h, @@ -8114,7 +8144,7 @@ publdate = {1983-03-30}, pagetotal = {2 с.~: ил.}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Patent{patent1, @@ -8133,7 +8163,7 @@ publdate = {2002-08-20}, pagetotal = {2 с.~: ил.}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Patent{patent2, @@ -8157,7 +8187,7 @@ prioritycountry ={countryus}, pagetotal = {5 с.~: ил.}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Patent{patent3, @@ -8176,7 +8206,7 @@ publdate = {1983-03-30}, pagetotal = {2 с.~: ил.}, language = {russian}, - hyphenation = {russian}, + langid = {russian}, } @Reference{standard1h, @@ -8190,7 +8220,7 @@ publisher = {Госстандарт России~: Изд-во стандартов}, year = 2001, pagetotal = {IV, 27 с. : ил.; 29 см.}, - hyphenation = {russian}, + langid = {russian}, } @Reference{standard2h, @@ -8205,7 +8235,7 @@ year = {cop. 2002}, pagetotal = 3, series = {Система стандартов по информации, библиотечному и издательскому делу}, - hyphenation = {russian}, + langid = {russian}, } @Reference{standard3h, @@ -8220,7 +8250,7 @@ year = 2006, pagetotal = 18, series = {Межгосударственный стандарт}, - hyphenation = {russian}, + langid = {russian}, } @Reference{standard1, @@ -8234,7 +8264,7 @@ publisher = {Госстандарт России~: Изд-во стандартов}, year = 2001, pagetotal = {IV, 27 с. : ил.; 29 см.}, - hyphenation = {russian}, + langid = {russian}, } @Reference{standard2, @@ -8249,7 +8279,7 @@ year = {cop. 2002}, pagetotal = 3, series = {Система стандартов по информации, библиотечному и издательскому делу}, - hyphenation = {russian}, + langid = {russian}, } @Reference{standard3, @@ -8264,7 +8294,7 @@ year = 2006, pagetotal = 18, series = {Межгосударственный стандарт}, - hyphenation = {russian}, + langid = {russian}, } @Article{guriev2012russia, @@ -8272,6 +8302,8 @@ author = {Гуриев, С. and Цывинский, О.}, journaltitle = {Ведомости}, date = {2012-06-06}, + language = {russian}, + langid = {russian}, } @InCollection{kasler:otm, @@ -8994,7 +9026,7 @@ series = {Universitext}, pagetotal = 630, language = {english}, - hyphenation = {english}, + langid = {english}, } @Book{fitting:ilmtf, @@ -9008,7 +9040,7 @@ location = {Amsterdam and London}, pagetotal = 191, language = {english}, - hyphenation = {english}, + langid = {english}, } @Book{moens:fskj, 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 Binary files differindex 63375a1b16d..6f178de85af 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf 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 b34820fe671..f69fa590845 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 @@ -21,6 +21,42 @@ ]{biblatex} \addbibresource{biblatex-gost-examples.bib} +% Russian sources first +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldset=langid, fieldvalue={tempruorder}] + } + \map[overwrite]{ + \step[fieldsource=langid, match=russian, final] + \step[fieldsource=presort, match=\regexp{(.+)}, replace=\regexp{aa$1}] %$ + } + \map{ + \step[fieldsource=langid, match=russian, final] + \step[fieldset=presort, fieldvalue={az}] + } + \map[overwrite]{ + \step[fieldsource=langid, notmatch=russian, final] + \step[fieldsource=presort, match=\regexp{(.+)}, replace=\regexp{za$1}] %$ + } + \map{ + \step[fieldsource=langid, notmatch=russian, final] + } + \map{ + \step[fieldsource=langid, match={tempruorder}, final] + \step[fieldset=langid, null] + } + \map{ + \step[fieldsource=entrykey, match=\regexp{badiou:ee$}, final] %$ + \step[fieldset=shorthand, fieldvalue={EE}] + } + \map{ + \step[fieldsource=entrykey, match=\regexp{badiou:ee2$}, final] %$ + \step[fieldset=shorthand, fieldvalue={EE2}] + } + } +} + \tolerance=1500 \xpatchbibmacro{related:default} diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf Binary files differindex 537da1fb424..1585bb536c9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf 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 34079479fd7..48499173e34 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -1,3 +1,4 @@ +% -*- mode: LaTeX; coding: utf-8; fill-column: 90 -*- \input glyphtounicode.tex %these three lines are \input glyphtounicode-cmr.tex %needed for russian search/copy \pdfgentounicode=1 %(cmap) @@ -163,9 +164,7 @@ bibstyle=gost-standard, Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3 or any later version\fnurl{http://mirror.ctan.org/macros/latex/base/lppl.txt}. -This package is -%author"= -maintained. +This package is maintained. \subsection{Установка} \label{sec:install} @@ -184,8 +183,8 @@ maintained. Для работы \biblatexgost версии \makeatletter\bbx@gost@version\makeatother\ требуются, как минимум, -\biblatex~3.3\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.3/} -и \biber~2.4\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.4/}. +\biblatex~3.5\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.5/} +и \biber~2.6\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.6/}. %(текущие версии на CTAN). Пакет может не работать с предыдущими версиями. @@ -196,6 +195,22 @@ maintained. точки зрения совместимости с предыдущими версиями. Более полный список изменений см. в \Apxref{apx:changelog}. +\subsubsection*{Версия 1.10} + +\begin{trivlist} +\item Исправлено сокращение <<док.>> на <<д-ра>>. +\end{trivlist} + +\subsubsection*{Версия 1.9} + +\begin{trivlist} +\item Версия не совместима с \biblatex версий ниже 3.5. +\item В \biblatex~3.5 для работы механизма пропуска даты для ссылок на уникальные работы + недостаточно опции \opt{singletitle}, нужно установить дополнительно опцию + \opt{uniquebaretitle} или воспользоваться опцией \biblatexgost \opt{dropdates}. + Подробнее см.~\secref{sec:newoptions}. +\end{trivlist} + \subsubsection*{Версии 1.8, 1.7, 1.6} \begin{trivlist} @@ -459,16 +474,18 @@ maintained. ссылок, которые выбираются опцией \opt{mergedate} (см.~\secref{sec:newoptions}). В частности, значение опции \kvopt{mergedate}{goststrict} соответствует строгому следованию ГОСТу, хотя при этом могут появляться неопределённые ссылки. -Стиль чувствителен к опции \opt{singletitle} и может не выводить год в ссылке, если он -не требуется для устранения неопределённости (например, если имеется лишь одна публикация -данного автора или лишь одна публикация без автора с данным названием). + Стиль чувствителен к опции \opt{dropdates} и может не выводить + год в ссылке, если он не требуется для устранения неопределённости (например, если + имеется лишь одна публикация данного автора или лишь одна публикация без автора с данным + названием). По умолчанию стиль устанавливает опции \kvopt{autocite}{inline}, \kvopt{sorting}{nyt}, \kvopt{pagetracker}{true}, \kvopt{mergedate}{gostletter}, -\kvopt{singletitle}{false} (или \opt{true} при \kvopt{mergedate}{goststrict}, +\kvopt{dropdates}{false}, +(или \opt{true} при \kvopt{mergedate}{goststrict}, см.~\secref{sec:newoptions}). \item[gost-alphabetic] @@ -854,7 +871,7 @@ eresource & электронный ресурс\\ используется текущий язык библиографической записи или цитаты. Это важно для многоязычных библиографий, если установлена опция -\kvopt{babel}{other} или \kvopt{babel}{other*}, и записи выводятся на разных языках. +\kvopt{autolang}{other} или \kvopt{autolang}{other*}, и записи выводятся на разных языках. \fielditem{sortvolume}{literal} @@ -985,7 +1002,7 @@ series = {|Полное собрание сочинений : для форте \tablesetup \centering \caption{Вывод полей \bibfield{afterword} и пр.\label{tab:afterword}} -\begin{tabularx}{.7\textwidth}{@{}V{.2\textwidth}@{}L{.3\textwidth}@{}L{.2\textwidth}@{}} +\begin{tabularx}{.8\textwidth}{@{}V{.2\textwidth}@{}L{.3\textwidth}@{}L{.3\textwidth}@{}} \toprule \multicolumn{1}{@{}H}{Поле} & \multicolumn{2}{@{}H}{Печатается как} \\ @@ -1025,6 +1042,8 @@ introduction & вступительная статья \prm{кого} & всту \item\textellipsis\ 2001.~"--- July.~"--- Vol.~34.~"--- \textellipsis \end{bibexample} +См.~также \secref{sec:dates} о предполагаемых и открытых датах. + \fielditem{edition}{integer/literal} Сведения об издании. Если целое число, то выводится в виде «5-е изд.». Если литерал, выводится как есть. Например: <<издание 13-е, существенно переработанное>>. @@ -1114,7 +1133,7 @@ introduction & вступительная статья \prm{кого} & всту \subsection{Тома, книги, части, выпуски} \label{sec:volsparts} -\begin{wraptable}[6]{o}{.5\textwidth} +\begin{wraptable}{o}{.5\textwidth} %\begin{table}[htbp] \tablesetup \centering @@ -1230,6 +1249,49 @@ volsorder = {pbi}, и поля \bibfield{volsorder}, поэтому при их изменении может потребоваться ручная настройка сортировки, например, при помощи поля \bibfield{sortvolume} (см.~\secref{sec:newfields}). +\subsection{Предполагаемые и открытые даты} +\label{sec:dates} + +В пакете частично реализована обработка дат в формате EDTF (см. раздел +<<Date and Time Specifications>> в документации \biblatex). +Вывод соответствует \gostbibref{5.5.5.3}, см. примеры в +\tabref{tab:dates}. +Прочерк в таблице означает, что спецификация не реализована "--- +поскольку требования ГОСТа на этот счёт неясны. +\begin{table}[htbp] + \tablesetup + \centering + \caption{Предполагаемые даты} + \label{tab:dates} + \begin{tabularx}{.6\linewidth}{V{.3\linewidth}X} + \toprule + \multicolumn{1}{H}{Значение поля \bibfield{date}} & + \multicolumn{1}{H}{Вывод в тексте} \\ + \cmidrule(r){1-1}\cmidrule{2-2} + 1997/unknown & 1997— \\ + 1997/open & 1997— \\ + 1942? & [1942?] \\ + 1900\textasciitilde & [ок. 1900] \\ + 1900?\textasciitilde & [ок. 1900?] \\ + 199u & [199\bibrangedash] \\ + 18uu & [18\bibrangedash\addnbspace\bibrangedash] \\ + % 17uu? & [17\bibrangedash\addnbspace\bibrangedash?] \\ + % 17uu? & "--- \\ + 1999-uu & "--- \\ + 1999-01-uu & "--- \\ + 1999-uu-uu & "--- \\ + % 1993/2002? & [1993—2002?] \\ + % 1993/2002\textasciitilde & [1993\bibrangedash ок. 2002] \\ + % 1993?\textasciitilde/2002? & [ок. 1993?\bibrangedash 2002?] \\ + \bottomrule + \end{tabularx} +\end{table} + +Нестандартные даты, такие как [1898 или 1899], [между 1908 и 1913], +[конец XIX "--- нач. XX в.] и пр., можно помещать в поле +\bibfield{year} в виде простой строки. + + \subsection{Оформление диссертаций и авторефератов} \label{sec:dissers} @@ -1341,6 +1403,7 @@ volsorder = {pbi}, Для совместимости с предыдущими версиями часть полей имеет альтернативные имена, приведённые в~\tabref{tab:patent-fields}. +Их использование не рекомендуется. % \begin{wraptable}{r}{0pt} \begin{table}[htb] @@ -1549,6 +1612,19 @@ gost-authoryear-min & --- & false \\ +\boolitem[false]{dropdates} + +Опция определена для стилей \bibsty{gost-authoryear} и \bibsty{gost-authoryear-min}. +Для таких стилей ГОСТ разрешает опускать дату, если она не создаёт двусмысленности, +например, если в тексте цитируется только одна работа данного автора или только один +сборник без автора с данным названием. +Опция \opt{dropdates} включает и выключает этот механизм. +По умолчанию даты выводятся всегда. + +Опция определена для удобства. +В настоящий момент она лишь включает/выключает опции \biblatex \opt{singletitle} и +\opt{uniquebaretitle}. + \boolitem[false]{inbookibid} Опция определена только для стилей \bibsty{gost-inline} и \bibsty{gost-footnote} @@ -1609,9 +1685,9 @@ gost-authoryear-min & --- & false \\ (\kvopt{mergedate}{compact {\rmfamily или} true}). \end{enumerate} Подробности см. в документации \biblatex, в примерах. -\biblatexgost сохраняет все эти опции, но поскольку ГОСТ не предусматривает вывод даты после -автора, то добавляет ещё три. -Все они чувствительны к опции \opt{singletitle} и могут опускать +\biblatexgost сохраняет все эти опции, но поскольку ГОСТ не предусматривает вывод даты +после автора, то добавляет ещё три. +Все они чувствительны к опции \opt{dropdates} и могут опускать дату, если она не требуется для устранения неопределённости. \begin{valuelist} @@ -1658,8 +1734,9 @@ gost-authoryear-min & --- & false \\ Например, если вы делаете ссылки на тома многотомного издания, то вам, возможно, понадобится указать том в \prm{postnote} или воспользоваться командами типа \cmd{volcite}. -Эта опция также устанавливает \kvopt{singletitle}{true}, то есть при ней по умолчанию -год в ссылке не выводится, если он не требуется для устранения неопределённости. +Эта опция также устанавливает \kvopt{drodates}{true}, то +есть при ней по умолчанию год в ссылке не выводится, если он не требуется для +устранения неопределённости. \end{valuelist} @@ -2212,6 +2289,21 @@ pageref & + & + & + & + & + & + & + & + \begin{changelog} + \begin{release}{1.10}{18-09-2016} + \item Исправлено сокращение <<док.>> на <<д-ра>>. + \end{release} + + \begin{release}{1.9}{12-09-2016} + \item Удалён обход несовместимостей с \biblatex~3.5. + \item Переписана обработка опций \opt{singletitle}, \opt{uniquebaretitle}. + Добавлена опция \opt{dropdates}.\see{sec:newoptions} + \item Поправлено копирование в \texttt{build.cmd}. + \item Изменён макрос \texttt{printdate} (расширен). + \item В примерах добавлена сортировка русских текстов в начало библиографии. + \item Переключатели \texttt{cbx:parens}, \texttt{cbx:loccit} изменены на + \texttt{cbx:gost:parens}, \texttt{cbx:gost:loccit}. + \item Исправлена ошибка вывода предполагаемых и открытых дат. + \end{release} \begin{release}{1.8}{30-08-2016} \item Установлено \kvopt{alldates}{short}, \kvopt{eventdate}{comp} @@ -2223,6 +2315,9 @@ pageref & + & + & + & + & + & + & + & + \item Исправлены ошибки вывода полей типа тома/номера/и т.\,д. \item Исправлены разные ошибки. \item Расширен файл примеров. + \item Изменения для совместимости с \biblatex~3.5. + \item Добавлена обработка предполагаемых и открытых + дат.\see{sec:dates} \end{release} \begin{release}{1.7}{18-07-2016} 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 53fe5745eea..e4ddb01d795 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -115,10 +115,10 @@ } \sort{ \field{heading} - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{maintitle} \field{title} @@ -160,10 +160,10 @@ } \sort{ \field{heading} - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{maintitle} \field{title} @@ -212,10 +212,10 @@ \literal{9999} } \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{maintitle} \field{title} @@ -243,10 +243,10 @@ \literal{9999} } \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{maintitle} \field{title} @@ -267,10 +267,10 @@ } \sort{ \field{heading} - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{maintitle} \field{title} @@ -312,10 +312,10 @@ } \sort{ \field{heading} - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{maintitle} \field{title} @@ -596,7 +596,7 @@ {\setunit*{\addcolon\space}}% \printlist{publisher}% \setunit*{\addcomma\space}% - \printdate}}} + \usebibmacro{date}}}} \renewbibmacro*{related:multivolume}[1]{% \entrydata*{#1}{% 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 f5635ea6aea..c64d29f7ad7 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 f5ef8f5f26c..cc5462e5644 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 bceb2a5e0ec..cbc74cbe3bb 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 2116ab1006e..95964ea502a 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 fc5311bbc53..cdb62e8f490 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 4c4258bca53..24d1f609372 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 a7b97745054..bb70dc54818 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx @@ -1,8 +1,13 @@ \ProvidesFile{gost-authoryear.bbx} -[2016/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} +\DeclareBibliographyOption{dropdates}[true]{% + \ifstrequal{#1}{true} + {\ExecuteBibliographyOptions{singletitle=true,uniquebaretitle=true}} + {\ExecuteBibliographyOptions{singletitle=false,uniquebaretitle=false}}} + \DeclareBibliographyOption{mergedate}[true]{% \ifcsdef{bbx@opt@mergedate@#1} {\csuse{bbx@opt@mergedate@#1}} @@ -11,175 +16,156 @@ {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak 'goststrict', 'gostletter', 'gostlabel', 'true' (=compact), and 'false'.}}} -\providebibmacro*{date+extrayear}{} +% whether the date is necessary for disambiguation +\newcommand*{\blx@gost@ifneedsdate}[2]{% + \ifnameundef{labelname} + {\ifuniquebaretitle{#2}{#1}} + {\ifsingletitle{#2}{#1}}} + +\providebibmacro*{labelyear+extrayear}{} \providebibmacro*{authoryearlabel}{} -\newbibmacro*{cite:date+extras}[1]{% - \ifsingletitle - {} - {\iffieldundef{year} - {} - {\printtext[#1]{% - \printdate% - \usebibmacro{cite:extras}}}}} \newbibmacro*{cite:extras}{% \ifnameundef{labelname}% if there is labelname, extrayear disambiguation is enough - {\printfield{extratitleyear}} + {\printfield{extratitleyear}} % if labeltitle+labelyear are the same {\printfield{extrayear}}} \providebibmacro*{labeltitle}{} \newlength{\labelauthoryearsep} +% label isn't taken into account since labeltitle is always provided +\newbibmacro*{labeltitle:common}{% + \blx@gost@ifneedsdate + {\printfield[title]{labeltitle}% + \clearfield{\thefield{labeltitlesource}}} + {}} + \def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact} \def\bbx@opt@mergedate@maximum{% - \renewbibmacro*{date+extrayear}{% - \ifsingletitle - {} - {\iffieldundef{year} + \renewbibmacro*{labelyear+extrayear}{% + \blx@gost@ifneedsdate + {\iffieldundef{labelyear} {} {\printtext[parens]{% - \ifentrytype{article} - {\printfield{issue}% - \setunit*{\addspace}} - {}% - \usebibmacro{cite:date+extras}{}% - \clearfield{month}% - \clearfield{day}}}}}% + % \ifentrytype{article} + % {\printfield{issue}% + % \clearfield{issue}% + % \setunit*{\addspace}} + % {}% + \usebibmacro{cite:labelyear+extras}{}% + \clearfield{\thefield{labeldatesource}month}% + \clearfield{\thefield{labeldatesource}day}}}} + {}}% %\renewcommand*{\labelnamepunct}{\newunitpunct} - \renewbibmacro*{jour:volume+parts+issuetitle}{% - \printfield{volume}% - \setunit*{\addcomma\space}% - \printfield{number}% - \iffieldundef{issuetitle} - {} - {\setunit{\addcolon\space}% - \printfield{issuetitle}}}% - \renewbibmacro*{date}{\ifsingletitle{\printdate}{}}% - \renewbibmacro*{year}{\ifsingletitle{\printfield{year}}{}}% + \renewbibmacro*{date}{\blx@gost@ifneedsdate{}{\usebibmacro{printdate}{}}}% + \renewbibmacro*{year}{\blx@gost@ifneedsdate{}{\usebibmacro{printyear}{}}}% \renewbibmacro*{jour:date}{% - \ifsingletitle + \blx@gost@ifneedsdate + {} {\usebibmacro{year}% \newunit\newblock - \mkbibdatelong{}{month}{day}} - {}}% - \renewbibmacro*{labeltitle}{% - \iffieldundef{label} - {\ifsingletitle - {} - {\iffieldundef{shorttitle} - {\iffieldundef{maintitle} - {\printfield{title}} - {\printfield[title]{maintitle}}}% - {\printfield[title]{shorttitle}}}} - {\printfield{label}}} + \mkbibdatelong{}{month}{day}}}% + \renewbibmacro*{labeltitle}{\usebibmacro{labeltitle:common}}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@compact{% - \renewbibmacro*{date+extrayear}{% - \usebibmacro{cite:date+extras}{parens}}% + \renewbibmacro*{labelyear+extrayear}{% + \blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}% %\renewcommand*{\labelnamepunct}{\newunitpunct} - \renewbibmacro*{date}{\ifsingletitle{\printdate}{}}% - \renewbibmacro*{year}{\ifsingletitle{\printfield{year}}{}}% + \renewbibmacro*{date}{\blx@gost@ifneedsdate{}{\usebibmacro{printdate}{}}}% + \renewbibmacro*{year}{\blx@gost@ifneedsdate{}{\usebibmacro{printyear}{}}}% \renewbibmacro*{jour:date}{% - \ifsingletitle + \blx@gost@ifneedsdate + {} {\usebibmacro{year}% \newunit\newblock - \mkbibdatelong{}{month}{day}} - {}}% - \renewbibmacro*{labeltitle}{% - \iffieldundef{label} - {\ifsingletitle - {} - {\iffieldundef{shorttitle} - {\iffieldundef{maintitle} - {\printfield{title}} - {\printfield[title]{maintitle}}}% - {\printfield[title]{shorttitle}}}} - {\printfield{label}}} + \mkbibdatelong{}{month}{day}}}% + \renewbibmacro*{labeltitle}{\usebibmacro{labeltitle:common}}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@basic{% - \renewbibmacro*{date+extrayear}{% - \usebibmacro{cite:labelyear+extras}{parens}}% + \renewbibmacro*{labelyear+extrayear}{% + \blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}% %\renewcommand*{\labelnamepunct}{\newunitpunct} \renewbibmacro*{date}{% - \ifsingletitle - {\printdate} - {\iffieldundef{month} + \blx@gost@ifneedsdate + {\ifthenelse{\(\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}\) + \AND\iffieldundef{month}} %if date is simply year {} - {\printdate}}}% - \renewbibmacro*{year}{\printfield{year}}% - \renewbibmacro*{labeltitle}{% - \iffieldundef{label} - {\ifsingletitle - {} - {\iffieldundef{shorttitle} - {\iffieldundef{maintitle} - {\printfield{title}} - {\printfield[title]{maintitle}}}% - {\printfield[title]{shorttitle}}}} - {\printfield{label}}} + {\usebibmacro{printdate}{}}} + {\usebibmacro{printdate}{}}}% + \renewbibmacro*{year}{% + \blx@gost@ifneedsdate + {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}} + {} + {\usebibmacro{printyear}{}}} + {\usebibmacro{printyear}{}}}% + \renewbibmacro*{jour:date}{% + \blx@gost@ifneedsdate + {\ifthenelse{\(\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}\) + \AND\iffieldundef{month}} %if date is simply year + {} + {\usebibmacro{year}% + \newunit\newblock + \mkbibdatelong{}{month}{day}}}% + {\usebibmacro{year}% + \newunit\newblock + \mkbibdatelong{}{month}{day}}}% + \renewbibmacro*{labeltitle}{\usebibmacro{labeltitle:common}}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@minimum{% - \renewbibmacro*{date+extrayear}{% - \usebibmacro{cite:labelyear+extras}{parens}}% + \renewbibmacro*{labelyear+extrayear}{% + \blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}% %\renewcommand*{\labelnamepunct}{\newunitpunct} \renewbibmacro*{date}{% - \ifsingletitle - {\printdate} - {\ifboolexpr{ - test {\iffieldundef{month}} - and - test {\iffieldundef{extrayear}} - } - {} - {\printdate}}}% - \renewbibmacro*{year}{\printfield{year}}% - \renewbibmacro*{labeltitle}{% - \iffieldundef{label} - {\ifsingletitle - {} - {\iffieldundef{shorttitle} - {\iffieldundef{maintitle} - {\printfield{title}} - {\printfield[title]{maintitle}}}% - {\printfield[title]{shorttitle}}}} - {\printfield{label}}} + \blx@gost@ifneedsdate + {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}} + {} + {\usebibmacro{printdate}{}}} + {\usebibmacro{printdate}{}}}% + \renewbibmacro*{year}{% + \blx@gost@ifneedsdate + {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}} + {} + {\usebibmacro{printyear}{}}} + {\usebibmacro{printyear}{}}}% + \renewbibmacro*{jour:date}{% + \blx@gost@ifneedsdate + {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}} + {} + {\usebibmacro{year}% + \newunit\newblock + \mkbibdatelong{}{month}{day}}}% + {\usebibmacro{year}% + \newunit\newblock + \mkbibdatelong{}{month}{day}}}% + \renewbibmacro*{labeltitle}{\usebibmacro{labeltitle:common}}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@false{% - \renewbibmacro*{date+extrayear}{% - \usebibmacro{cite:labelyear+extras}{parens}}% + \renewbibmacro*{labelyear+extrayear}{% + \blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}% %\renewcommand*{\labelnamepunct}{\newunitpunct} - \renewbibmacro*{date}{\printdate}% - \renewbibmacro*{year}{\printfield{year}}% - \renewbibmacro*{labeltitle}{% - \iffieldundef{label} - {\ifsingletitle - {} - {\iffieldundef{shorttitle} - {\iffieldundef{maintitle} - {\printfield{title}} - {\printfield[title]{maintitle}}}% - {\printfield[title]{shorttitle}}}} - {\printfield{label}}} + \renewbibmacro*{date}{\usebibmacro{printdate}{}}% + \renewbibmacro*{year}{\usebibmacro{printyear}{}}% + \renewbibmacro*{labeltitle}{\usebibmacro{labeltitle:common}}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@goststrict{% - \renewbibmacro*{date+extrayear}{}% - \renewbibmacro*{date}{\printdate}% - \renewbibmacro*{year}{\printfield{year}}% + \renewbibmacro*{labelyear+extrayear}{}% + \renewbibmacro*{date}{\usebibmacro{printdate}{}}% + \renewbibmacro*{year}{\usebibmacro{printyear}{}}% \renewbibmacro*{labeltitle}{}% \DeclareFieldFormat{extrayear}{% \PackageWarning{biblatex-gost}{% @@ -187,50 +173,64 @@ \DeclareFieldFormat{extratitleyear}{% \PackageWarning{biblatex-gost}{% Citation \thefield{entrykey} is not unique}}% - \ExecuteBibliographyOptions{singletitle}% + \ExecuteBibliographyOptions{singletitle,uniquebaretitle}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@gostletter{% - \renewbibmacro*{date+extrayear}{}% - \renewbibmacro*{date}{\printdate\usebibmacro{cite:extras}}% - \renewbibmacro*{year}{\printfield{year}\usebibmacro{cite:extras}}% + \renewbibmacro*{labelyear+extrayear}{}% + \renewbibmacro*{date}{\usebibmacro{printdate}{}\usebibmacro{cite:extras}}% + \renewbibmacro*{year}{\usebibmacro{printyear}{}\usebibmacro{cite:extras}}% \renewbibmacro*{labeltitle}{}% \renewbibmacro*{authoryearlabel}{}% \setlength{\labelauthoryearsep}{0pt}% } \def\bbx@opt@mergedate@gostlabel{% - \renewbibmacro*{date+extrayear}{}% - \renewbibmacro*{date}{\printdate}% - \renewbibmacro*{year}{\printfield{year}}% + \renewbibmacro*{labelyear+extrayear}{}% + \renewbibmacro*{date}{\usebibmacro{printdate}{}}% + \renewbibmacro*{year}{\usebibmacro{printyear}{}}% \renewbibmacro*{labeltitle}{}% \renewbibmacro*{heading}{}% \renewbibmacro*{authoryearlabel}{% \mkbibbrackets{% - \iffieldundef{heading} - {\iffieldundef{shorthand} - {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} - {\ifnameundef{labelname} - {\usebibmacro{cite:label+volume+parts}{}% - \setunit{\nameyeardelim}% - \usebibmacro{cite:labelyear+extras}{}} - {\usebibmacro{cite:labelname+volume+parts}{}}} - {\usebibmacro{cite:labelname+volume+parts}{}% - \setunit{\nameyeardelim}% - \usebibmacro{cite:labelyear+extras}{}}} - {\printfield{shorthand}}} - {\usebibmacro{cite:heading}{}}}}% + \iffieldundef{shorthand} + {\iffieldundef{heading} + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} + {\ifnameundef{labelname} + {% no labelname + \iffieldundef{label} + {% no label, so print labeltitle (always present) + \blx@gost@ifneedsdate + {\printfield[citetitle]{labeltitle} + \setunit{\nameyeardelim}% + \usebibmacro{cite:labelyear+extras}{}} + {\printfield[citetitle]{labeltitle}}} + {% label exists, print it + \usebibmacro{cite:label+volume+parts}}}% + {% labelname, no labelyear + \usebibmacro{cite:labelname+volume+parts}{}}}% + {% both labelname, labelyear exist + \blx@gost@ifneedsdate + {\usebibmacro{cite:labelname+volume+parts}{}% + \setunit{\nameyeardelim}% + \usebibmacro{cite:labelyear+extras}{}}% + {\usebibmacro{cite:labelname+volume+parts}{}}}} + {\usebibmacro{cite:heading}{bibhyperref}% + % \iffieldundef{labelyear} + % {} + % {\setunit{\nameyeardelim}% + % \usebibmacro{cite:labelyear+extras}{bibhyperref}} + }}% + {\usebibmacro{cite:shorthand}}}}% \setlength{\biblabelsep}{.5em}% \setlength{\labelauthoryearsep}{\biblabelsep}% } -\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ - {\ExecuteBibliographyOptions{labeldateparts,labeltitleyear,sorting=nyt,pagetracker,mergedate=gostletter, - bibisbn,biburl,bibdoi,bibeprint}} - {\ExecuteBibliographyOptions{labeldate,labeltitleyear,sorting=nyt,pagetracker,mergedate=gostletter, - bibisbn,biburl,bibdoi,bibeprint}} +\ExecuteBibliographyOptions{labeldateparts,labeltitleyear,sorting=nyt,pagetracker, + mergedate=gostletter,dropdates=false, + bibisbn,biburl,bibdoi,bibeprint} \DeclareFieldFormat{shorthandwidth}{#1} \setlength{\bibitemsep}{0pt} @@ -277,7 +277,7 @@ {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% - \usebibmacro{date+extrayear}} + \usebibmacro{labelyear+extrayear}} \renewbibmacro*{editor}{% @@ -301,7 +301,7 @@ {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% - \usebibmacro{date+extrayear}} + \usebibmacro{labelyear+extrayear}} \renewbibmacro*{translator}{% \usebibmacro{bbx:translator}{translatorstrg}} @@ -324,7 +324,7 @@ {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% - \usebibmacro{date+extrayear}} + \usebibmacro{labelyear+extrayear}} \endinput 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 c5dc01c5688..bc59cf32bca 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx @@ -1,21 +1,17 @@ \ProvidesFile{gost-authoryear.cbx} -[2016/08/30\space v1.8\space biblatex-gost styles] - -\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ - {\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, - singletitle=false,labeldateparts,labeltitleyear,uniquename=init, - uniquelist,ibidtracker=constrict,pagetracker,sortcites,autocite=inline, - citeisbn,citeurl,citedoi,citeeprint}} - {\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, - singletitle=false,labeldate,labeltitleyear,uniquename=init, - uniquelist,ibidtracker=constrict,pagetracker,sortcites,autocite=inline, - citeisbn,citeurl,citedoi,citeeprint}} +[2016/09/18\space v1.10\space biblatex-gost styles] + +\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, + dropdates=false, + labeldateparts,labeltitleyear,uniquename=init, + uniquelist,ibidtracker=constrict,pagetracker,sortcites,autocite=inline, + citeisbn,citeurl,citedoi,citeeprint} \providecommand*{\mkibid}[1]{#1} \renewcommand*{\iffinalcitedelim}{% \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} -\newbool{cbx:parens} -\newbool{cbx:loccit} +\newbool{cbx:gost:parens} +\newbool{cbx:gost:loccit} \DeclareBibliographyOption{ibidpage}[true]{% \ifstrequal{#1}{true} @@ -28,16 +24,13 @@ \newcommand{\mkbibbracketssentence}[1]{\bibsentence\mkbibbrackets{#1}\midsentence} \DeclareFieldFormat*{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat{extratitleyear}{% - \iffieldnum{labelyear} - {\mknumalph{#1}} - {\printtext{(\mknumalph{#1})}}} +\DeclareFieldFormat{extratitleyear}{\mknumalph{#1}} \DeclareFieldFormat{citeheading}{#1} \newbibmacro*{cite:init}{% - \global\boolfalse{cbx:loccit}% + \global\boolfalse{cbx:gost:loccit}% \ifnumless{\value{multicitecount}}{2} - {\global\boolfalse{cbx:parens}% + {\global\boolfalse{cbx:gost:parens}% \global\undef\cbx@lasthash \global\undef\cbx@lastyear} {\iffieldundef{prenote} @@ -56,12 +49,22 @@ {\iffieldundef{heading} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\ifnameundef{labelname} - {\usebibmacro{cite:label+volume+parts}{bibhyperref}% - \setunit{\nameyeardelim}% - \usebibmacro{cite:labelyear+extras}{bibhyperref}} - {\usebibmacro{cite:labelname+volume+parts}{bibhyperref}}% - \usebibmacro{cite:reinit}} - {\iffieldequals{namehash}{\cbx@lasthash} + {% no labelname + \iffieldundef{label} + {% no label, so print labeltitle (always present) + \blx@gost@ifneedsdate + {\printfield[citetitle]{labeltitle} + \setunit{\nameyeardelim}% + \usebibmacro{cite:labelyear+extras}{bibhyperref}} + {\printtext[bibhyperref]{% + \printfield[citetitle]{labeltitle}}}} + {% label exists, print it + \usebibmacro{cite:label+volume+parts}}}% + {% labelname, no labelyear + \usebibmacro{cite:labelname+volume+parts}{bibhyperref}% + \usebibmacro{cite:reinit}}}% + {% both labelname, labelyear exist + \iffieldequals{namehash}{\cbx@lasthash} {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% @@ -69,12 +72,12 @@ {\setunit{\compcitedelim}% \usebibmacro{cite:labelyear+extras}{bibhyperref}% \savefield{labelyear}{\cbx@lastyear}}} - {\ifsingletitle - {\usebibmacro{cite:labelname+volume+parts}{bibhyperref}} + {\blx@gost@ifneedsdate {\usebibmacro{cite:labelname+volume+parts}{}% \setunit{\nameyeardelim}% \usebibmacro{cite:labelyear+extras}{bibhyperref}% \savefield{labelyear}{\cbx@lastyear}}% + {\usebibmacro{cite:labelname+volume+parts}{bibhyperref}}% \savefield{namehash}{\cbx@lasthash}}}} {\usebibmacro{cite:heading}{bibhyperref}% % \iffieldundef{labelyear} @@ -92,24 +95,20 @@ %\usebibmacro{volume+parts}{\setunit*{\addcomma\space}}% } -\newbibmacro*{cite:label+volume+parts}[1]{% +\newbibmacro*{cite:label+volume+parts}{% \iffieldundef{label} - {\ifsingletitle - {\printtext[#1]{\printfield[citetitle]{labeltitle}}} - {\printfield[citetitle]{labeltitle}}} - {\printtext[#1]{\printfield{label}}}% + {} + {\printtext[bibhyperref]{\printfield{label}}}% \setunit*{\addcomma\space}% %\usebibmacro{volume+parts}{\setunit*{\addcomma\space}}% } \newbibmacro*{cite:labelyear+extras}[1]{% - \ifsingletitle + \iffieldundef{labelyear} {} - {\iffieldundef{labelyear} - {} - {\printtext[#1]{% - \printfield{labelyear}% - \usebibmacro{cite:extras}}}}} + {\printtext[#1]{% + \usebibmacro{printyear}{label}% print labelyear + \usebibmacro{cite:extras}}}} \newbibmacro*{citeyear}{% \iffieldundef{shorthand} @@ -150,7 +149,7 @@ {\iffieldundef{shorthand} {\usebibmacro{cite:label}% \setunit{% - \global\booltrue{cbx:parens}% + \global\booltrue{cbx:gost:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} @@ -161,7 +160,7 @@ {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% - \global\booltrue{cbx:parens}% + \global\booltrue{cbx:gost:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} @@ -178,8 +177,8 @@ \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \setunit{% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + \ifbool{cbx:gost:parens} + {\bibcloseparen\global\boolfalse{cbx:gost:parens}} {}% \textcitedelim}} @@ -198,7 +197,7 @@ \iffieldundef{labelyear} {} {\printtext[bibhyperref]{% - \printfield{labelyear}% + \usebibmacro{printyear}{label}% \printfield{extrayear}}}} \newbibmacro*{cite:extrayear}{% @@ -209,27 +208,27 @@ \newbibmacro*{cite:ibid}{% \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}% \ifloccit - {\global\booltrue{cbx:loccit}} + {\global\booltrue{cbx:gost:loccit}} {}} \newbibmacro*{cite:postnote}{% - \ifbool{cbx:loccit} + \ifbool{cbx:gost:loccit} {} {\usebibmacro{postnote}}} \newbibmacro*{textcite:postnote}{% - \ifbool{cbx:loccit} + \ifbool{cbx:gost:loccit} {} {\usebibmacro{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + \ifbool{cbx:gost:parens} + {\bibcloseparen\global\boolfalse{cbx:gost:parens}} {}}} {\setunit{% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + \ifbool{cbx:gost:parens} + {\bibcloseparen\global\boolfalse{cbx:gost:parens}} {}% \textcitedelim}}} 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 0b6e988af39..e606882b44e 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 c445687a67e..89e780966d5 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 c26c965d469..d660488e978 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 8cc082b5482..8533babd4b1 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 73b91d7530d..536add942fa 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 4dc41899a32..7c34d1c4205 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 25ad089aafa..c63ffbb9c5a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx @@ -1,13 +1,10 @@ \ProvidesFile{gost-inline.bbx} -[2016/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} -\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ - {\ExecuteBibliographyOptions{labeldateparts,sorting=ntvy,pagetracker,dashed=false, - bibisbn,biburl,bibdoi,bibeprint}} - {\ExecuteBibliographyOptions{labeldate,sorting=ntvy,pagetracker,dashed=false, - bibisbn,biburl,bibdoi,bibeprint}} +\ExecuteBibliographyOptions{labeldateparts,sorting=ntvy,pagetracker,dashed=false, + bibisbn,biburl,bibdoi,bibeprint} \DeclareFieldFormat{shorthandwidth}{#1} \setlength{\bibitemsep}{0pt} 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 427338ccd56..e6c9a264a11 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx index 108988fc38f..ee32a927dd5 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 686eb14ca19..918368fa249 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 8175f8991fe..5661580825e 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 822e4c6482e..4984c25405c 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\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 d9de27c3af3..5cfcfb3bf40 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\space biblatex-gost styles] -\def\bbx@gost@date{2016/08/30} -\def\bbx@gost@version{1.8} +\def\bbx@gost@date{2016/09/18} +\def\bbx@gost@version{1.10} \@ifpackagelater{biblatex}{2016/03/03} {} @@ -44,15 +44,6 @@ \newtoggle{bbx:gostbibliography} \togglefalse{bbx:gostbibliography} -\@ifpackagelater{biblatex}{2016/05/11} % biblatex 3.5+ - {} - {\protected\def\blx@imc@printupdate{\csuse{mkbibrangeshort}{up}} - \protected\def\blx@imc@printpublicationdate{\csuse{mkbibrangeshort}{publication}} - \protected\def\blx@imc@printprioritydate{\csuse{mkbibrangeshort}{priority}} - \newcommand{\bibdaterangesep}{\bibdatedash}} -\blx@regimcs{% - \printupdate \printpublicationdate \printprioritydate} - % OPTIONS \newbibmacro*{bbx:savehash}{% @@ -124,9 +115,8 @@ maxnames=3, minnames=1, dashed=false, - singletitle=false, movenames=true, - giveninits, + giveninits=true, volsorder=vbpi, related=true, alldates=short, @@ -256,7 +246,8 @@ \ifbibxstring{\thefield{prioritycountry}} {\bibcpstring{\thefield{prioritycountry}}} {#1}} - +\DeclareFieldFormat{bracketsalways}{[#1]} + \DeclareNameAlias{default}{given-family} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} @@ -1773,8 +1764,11 @@ \setcounter{blx@gost@pointer}{1}% \expandafter\blx@gost@volsinorder\gost@tempa\blx@gost@endofstring}} +\renewbibmacro*{date}{% + \usebibmacro{printdate}{}} + \newbibmacro*{year}{% - \printfield{year}} + \usebibmacro{printyear}{}} \renewbibmacro*{title}{% \ifboolexpr{ @@ -2111,6 +2105,98 @@ \newbibmacro*{heading}{% \printfield{heading}} +% whether date needs brackets. +% labeldate needs special account +\newcommand*{\blx@gost@ifdateuncertain}[3]{% + \ifboolexpr{ + test {\csuse{if#1datecirca}} + or + test {\csuse{if#1dateuncertain}} + or + test {\csuse{if#1enddatecirca}} + or + test {\csuse{if#1enddateuncertain}} + or + not test {\iffieldundef{#1dateunspecified}} + or ( + test {\ifstrequal{#1}{label}} + and + not test {\iffieldundef{\thefield{labeldatesource}dateunspecified}} + ) + } + {#2} + {#3}} + +% Adds brackets is necessary +\newbibmacro*{printdate}[1]{% + \blx@gost@ifdateuncertain{#1} + {\printtext[bracketsalways]{\midsentence*% + \ifstrequal{#1}{label} + {\iffieldequalstr{\thefield{labeldatesource}dateunspecified}{yearincentury} + {\number\numexpr\thefield{\thefield{labeldatesource}year}/100\relax% + \bibrangedash\addnbspace\bibrangedash} + {\iffieldequalstr{\thefield{labeldatesource}dateunspecified}{yearindecade} + {\number\numexpr\thefield{\thefield{labeldatesource}year}/10\relax\bibrangedash}% + {\csuse{print#1date}}}} + {\iffieldequalstr{#1dateunspecified}{yearincentury} + {\number\numexpr\thefield{#1year}/100\relax% + \bibrangedash\addnbspace\bibrangedash} + {\iffieldequalstr{#1dateunspecified}{yearindecade} + {\number\numexpr\thefield{#1year}/10\relax\bibrangedash}% + {\csuse{print#1date}}}}}} + {\csuse{print#1date}}} + +\newbibmacro*{printyear}[1]{% + \blx@gost@ifdateuncertain{#1} + {\printtext[bracketsalways]{\midsentence*% + \ifstrequal{#1}{label} + {\iffieldequalstr{\thefield{labeldatesource}dateunspecified}{yearincentury} + {\number\numexpr\thefield{\thefield{labeldatesource}year}/100\relax% + \bibrangedash\addnbspace\bibrangedash} + {\iffieldequalstr{\thefield{labeldatesource}dateunspecified}{yearindecade} + {\number\numexpr\thefield{\thefield{labeldatesource}year}/10\relax\bibrangedash} + {\usebibmacro{printyear+}{#1}}}} + {\iffieldequalstr{#1dateunspecified}{yearincentury} + {\number\numexpr\thefield{#1year}/100\relax% + \bibrangedash\addnbspace\bibrangedash} + {\iffieldequalstr{#1dateunspecified}{yearindecade} + {\number\numexpr\thefield{#1year}/10\relax\bibrangedash} + {\usebibmacro{printyear+}{#1}}}}}} + {\usebibmacro{printyear+}{#1}}} + +\newbibmacro*{printyear+}[1]{% + \printtext{% + \iffieldundef{#1year} + {} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{#1year}% + \mkyearzeros{\thefield{#1year}}% + % \printfield{extrayear}% + \iffieldsequal{#1dateera}{#1enddateera} + {} + {\dateeraprint{#1year}}% + \dateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{#1endyear} + {} + {\iffieldsequal{#1year}{#1endyear} + {} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep% + \enddatecircaprint}% + \dateeraprintpre{#1endyear}% + \mkyearzeros{\thefield{#1endyear}}% + \enddateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{#1endyear}}}}}} + \newcommand*{\setrespdelim}{\bbx@gost@respdelim\def\bbx@gost@respdelim{}} % Related field 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 7641feeffff..95681fe2326 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/08/30\space v1.8\space biblatex-gost styles] +[2016/09/18\space v1.10\space biblatex-gost styles] \InheritBibliographyExtras{russian} @@ -7,12 +7,12 @@ inherit = {russian},%------------------------------------------------------------ phdthesis = {{дис\adddotspace\textellipsis\ канд\adddot} {дис\adddotspace\textellipsis\ канд\adddot}}, - docthesis = {{дис\adddotspace\textellipsis\ док\adddot} - {дис\adddotspace\textellipsis\ док\adddot}}, + docthesis = {{дис\adddotspace\textellipsis\ д-ра} + {дис\adddotspace\textellipsis\ д-ра}}, phdautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ канд\adddot} {автореф\adddotspace дис\adddotspace\textellipsis\ канд\adddot}}, - docautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ док\adddot} - {автореф\adddotspace дис\adddotspace\textellipsis\ док\adddot}}, + docautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ д-ра} + {автореф\adddotspace дис\adddotspace\textellipsis\ д-ра}}, countryru = {{Российская Федерация}{Рос\adddotspace Федерация}}, countryussr = {{СССР}{СССР}}, patentru = {{патент Российской Федерации}{пат\adddotspace Рос\adddotspace Федерации}}, |