From 0c5dc569eaa0dd4a13dc3048418060f8f366a4eb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 28 Jan 2017 22:59:34 +0000 Subject: biblatex-gost (28jan17) git-svn-id: svn://tug.org/texlive/trunk@43072 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-gost/biblatex-gost-examples.bib | 10 +++++----- .../latex/biblatex-gost/biblatex-gost-examples.pdf | Bin 802884 -> 803154 bytes .../doc/latex/biblatex-gost/biblatex-gost.pdf | Bin 252993 -> 253413 bytes .../doc/latex/biblatex-gost/biblatex-gost.tex | 8 +++++++- .../tex/latex/biblatex-gost/biblatex-gost.dbx | 2 +- .../tex/latex/biblatex-gost/biblatex-gost.def | 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 | 11 +++-------- .../tex/latex/biblatex-gost/russian-gost.lbx | 20 +++++++++++--------- 38 files changed, 58 insertions(+), 55 deletions(-) (limited to 'Master') 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 9459744d14f..0ffeecc074a 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 @@ -8034,7 +8034,7 @@ title = {Религиозная политика Золотой Орды на Руси в XIII—XIV вв.\isdot}, media = {text}, type = {phdthesis}, - major = {ист. наук}, + major = {ист.}, majorcode = {07.00.02}, titleaddon = {защищена 22.01.02~: утв. 15.07.02}, location = {М.}, @@ -8051,7 +8051,7 @@ title = {Модели и методы оценки коммерческих банков в условиях неопределенности}, media = {text}, type = {phdthesis}, - major = {экон. наук}, + major = {экон.}, majorcode = {08.00.13}, titleaddon = {защищена 12.02.02~: утв. 24.06.02}, location = {М.}, @@ -8070,7 +8070,7 @@ institution = {ИТФ им. Л.\,Д.~Ландау}, year = 2008, type = {docthesis}, - major = {физ.-мат. наук}, + major = {физ.-мат.}, majorcode = {01.04.02}, pagetotal = 224, location = {Черноголовка}, @@ -8082,7 +8082,7 @@ crossref = {Skvortsov:2008}, type = {docautoref}, language = {russian}, - langid = {russian}, + langid = {russian}, } @Patent{patent1h, @@ -10362,7 +10362,7 @@ editor = {В. Бурцев}, editortype = {compiler}, editora = {С. М. {Кравчинского (Степняка)}}, - editoratype = {collaborator}, + editoratype = {editorcollaborator}, language = {russian}, langid = {russian}, parts = 2, 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 71dc6f2fdc0..d4ea8265b76 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 44b6a10fe7f..ec0f2f2fb56 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 9b89c0b0aca..93d64ebda0b 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -195,7 +195,7 @@ This package is maintained. точки зрения совместимости с предыдущими версиями. Более полный список изменений см. в \Apxref{apx:changelog}. -\subsubsection*{Версия 1.11} +\subsubsection*{Версия 1.11a} \begin{trivlist} \item При заполнении поля \bibfield{major} в описании диссертаций @@ -2323,6 +2323,12 @@ pageref & + & + & + & + & + & + & + & + \label{apx:changelog} \begin{changelog} + \begin{release}{1.11a}{28-01-2017} + \item При заполнении поля \bibfield{major} в описании диссертаций теперь нужно писать + «экон.», «физ.-мат.» и пр. вместо «экон. наук», «физ.-мат. наук» и пр. (в версии 1.11 + добавил это в документацию, но забыл добавить в код)\see{sec:dissers} + \end{release} + \begin{release}{1.11}{27-01-2017} \item Определены типы записей \bibtype{candthesis} и \bibtype{docthesis}.\see{sec:dissers} 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 a3a08302a58..0a15f5a1c45 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 84901d3288d..f871d713334 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} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ 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 846a58bc843..80597a2e477 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 e6e864f1256..fa7aee8d04b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 297e23c20f7..242a1b42b11 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 cd8248a5c56..9895e123652 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 f25f60f7f21..20d40b77df8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 c2c696b86a6..1846b4b77fc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 25f40c9bdf3..0f0c9044fb3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 0aab283bbd9..6181e17e9e4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 2bc0b3eb0f2..41d351d38e6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 e7355a9b763..d2760731495 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 d74d560b95d..814e7816574 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 1551e52520c..4f23809f9ee 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 0788c1affeb..2a96bc37780 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 a9229f64b41..6cbc4ba5fff 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 211611b3bdd..0d9845bffe6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 deccac0dd3d..620230d7fe1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 acbe73fdd26..5e511454fc0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 0a9d5493118..e1ae9e4cf46 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 11b92f6fed4..eb090ffd572 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 310151f2020..618206d726d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 6f7dcd3f9a0..242856f5505 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 5fb9ba682d4..626b28462e0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 265acee8776..4e460934cd2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 0005f4f1776..89f2809f651 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 d866a557d7e..1b46a74e7e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 c76b5c9aebd..a4129dfcad6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 9d49ae673a1..687ac712a7a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 dd9169f28c9..c24d89d7257 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 76454b847cc..841171cd564 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.cbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\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 b311a6aaaa2..ba23c608958 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.dbx} -[2017/01/27\space v1.11\space biblatex-gost data model] +[2017/01/28\space v1.11a\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 8c5ae06648a..7c566508219 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx @@ -1,8 +1,8 @@ \ProvidesFile{gost-standard.bbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\space biblatex-gost styles] -\def\bbx@gost@date{2017/01/27} -\def\bbx@gost@version{1.11} +\def\bbx@gost@date{2017/01/28} +\def\bbx@gost@version{1.11a} \@ifpackagelater{biblatex}{2016/03/03} {} @@ -361,11 +361,6 @@ \iffieldnum{edition} {\mkbibordedition{#1}\addnbspace\bibstring{edition}} {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} -\DeclareFieldFormat[thesis]{type}{% - \ifbibstring{#1}{\biblstring{#1}% - \setunit*{\addspace}% - \printfield{major}}% - {#1}} \DeclareFieldFormat{prioritycountry}{% \ifbibxstring{\thefield{prioritycountry}} {\bibcpstring{\thefield{prioritycountry}}} 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 7ed7f6f966f..18f9c5bc0ba 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx @@ -1,18 +1,20 @@ \ProvidesFile{russian-gost.lbx} -[2017/01/27\space v1.11\space biblatex-gost styles] +[2017/01/28\space v1.11a\space biblatex-gost styles] \InheritBibliographyExtras{russian} \DeclareBibliographyStrings{% inherit = {russian},%------------------------------------------------------------ - phdthesis = {{дис\adddotspace\textellipsis\ канд\adddot} - {дис\adddotspace\textellipsis\ канд\adddot}}, - docthesis = {{дис\adddotspace\textellipsis\ д-ра} - {дис\adddotspace\textellipsis\ д-ра}}, - phdautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ канд\adddot} - {автореф\adddotspace дис\adddotspace\textellipsis\ канд\adddot}}, - docautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ д-ра} - {автореф\adddotspace дис\adddotspace\textellipsis\ д-ра}}, + mathesis = {{дис\adddotspace\textellipsis\ маг. \printfield{major} наук} + {дис\adddotspace\textellipsis\ маг. \printfield{major} наук}}, + phdthesis = {{дис\adddotspace\textellipsis\ канд. \printfield{major} наук} + {дис\adddotspace\textellipsis\ канд. \printfield{major} наук}}, + docthesis = {{дис\adddotspace\textellipsis\ д-ра \printfield{major} наук} + {дис\adddotspace\textellipsis\ д-ра \printfield{major} наук}}, + phdautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ канд. \printfield{major} наук} + {автореф\adddotspace дис\adddotspace\textellipsis\ канд. \printfield{major} наук}}, + docautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ д-ра \printfield{major} наук} + {автореф\adddotspace дис\adddotspace\textellipsis\ д-ра \printfield{major} наук}}, countryru = {{Российская Федерация}{Рос\adddotspace Федерация}}, countryussr = {{СССР}{СССР}}, patentru = {{патент Российской Федерации}{пат\adddotspace Рос\adddotspace Федерации}}, -- cgit v1.2.3