texlive[43146] Master/texmf-dist: biblatex-gost (5feb17)
commits+karl at tug.org
commits+karl at tug.org
Mon Feb 6 00:18:52 CET 2017
Revision: 43146
http://tug.org/svn/texlive?view=revision&revision=43146
Author: karl
Date: 2017-02-06 00:18:52 +0100 (Mon, 06 Feb 2017)
Log Message:
-----------
biblatex-gost (5feb17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib
trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex
trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib 2017-02-05 23:18:52 UTC (rev 43146)
@@ -7033,7 +7033,7 @@
origyear = 1904,
origlanguage = {english},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Book{dewey:oep,
@@ -8034,8 +8034,8 @@
title = {Религиозная политика Золотой Орды на Руси в XIII—XIV вв.\isdot},
media = {text},
type = {phdthesis},
- major = {ист.},
- majorcode = {07.00.02},
+ science = {ист. наук},
+ number = {07.00.02},
titleaddon = {защищена 22.01.02~: утв. 15.07.02},
location = {М.},
date = 2002,
@@ -8042,7 +8042,7 @@
pagetotal = 215,
addendum = {Библиогр.: с. 202---213.~--- 04200201565},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Thesis{vishnyakov:thesis,
@@ -8051,8 +8051,8 @@
title = {Модели и методы оценки коммерческих банков в условиях неопределенности},
media = {text},
type = {phdthesis},
- major = {экон.},
- majorcode = {08.00.13},
+ science = {экон. наук},
+ specialitycode ={08.00.13},
titleaddon = {защищена 12.02.02~: утв. 24.06.02},
location = {М.},
date = 2002,
@@ -8059,7 +8059,7 @@
pagetotal = 234,
addendum = {Библиогр.: с. 220---230.~--- 04200204433},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Thesis{Skvortsov:2008,
@@ -8070,12 +8070,12 @@
institution = {ИТФ им. Л.\,Д.~Ландау},
year = 2008,
type = {docthesis},
- major = {физ.-мат.},
- majorcode = {01.04.02},
+ science = {физ.-мат. наук},
+ specialitycode ={01.04.02},
pagetotal = 224,
location = {Черноголовка},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Thesis{Skvortsov:2008autoref,
@@ -8085,6 +8085,23 @@
langid = {russian},
}
+ at Thesis{domanovdi,
+ author = {Доманов, Дмитрий Иванович},
+ title = {Вероятностный анализ риска возникновения катастрофического состояния
+ применяемых в мостостроении косо опертых плитно-балочных систем из
+ железобетона при воздействии подвижной нагрузки},
+ type = {phdthesis},
+ science = {технических наук},
+ _institution = {Воронеж. гос. архитектур.-строит. ун-т},
+ credits = {[Место защиты: Воронеж. гос. архитектур.-строит. ун-т]},
+ year = 2016,
+ number = {05.23.17},
+ language = {russian},
+ langid = {russian},
+ location = {Воронеж},
+ pagetotal = {159 с. : ил.},
+}
+
@Patent{patent1h,
heading = {Пат. 2187888 Рос. федерация, МПК\ensuremath{^7} H 04 B 1/38, H 04 J},
author = {Чугаева, В. И.},
@@ -8101,7 +8118,7 @@
publdate = {2002-08-20},
pagetotal = {2 с.~: ил.},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Patent{patent2h,
@@ -8125,7 +8142,7 @@
prcountry = {countryus},
pagetotal = {5 с.~: ил.},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Patent{patent3h,
@@ -8144,7 +8161,7 @@
publdate = {1983-03-30},
pagetotal = {2 с.~: ил.},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Patent{patent1,
@@ -8163,7 +8180,7 @@
publdate = {2002-08-20},
pagetotal = {2 с.~: ил.},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Patent{patent2,
@@ -8187,7 +8204,7 @@
prioritycountry ={countryus},
pagetotal = {5 с.~: ил.},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Patent{patent3,
@@ -8206,7 +8223,7 @@
publdate = {1983-03-30},
pagetotal = {2 с.~: ил.},
language = {russian},
- langid = {russian},
+ langid = {russian},
}
@Reference{standard1h,
@@ -8220,7 +8237,7 @@
publisher = {Госстандарт России~: Изд-во стандартов},
year = 2001,
pagetotal = {IV, 27 с. : ил.; 29 см.},
- langid = {russian},
+ langid = {russian},
}
@Reference{standard2h,
@@ -8235,7 +8252,7 @@
year = {cop. 2002},
pagetotal = 3,
series = {Система стандартов по информации, библиотечному и издательскому делу},
- langid = {russian},
+ langid = {russian},
}
@Reference{standard3h,
@@ -8250,7 +8267,7 @@
year = 2006,
pagetotal = 18,
series = {Межгосударственный стандарт},
- langid = {russian},
+ langid = {russian},
}
@Reference{standard1,
@@ -8264,7 +8281,7 @@
publisher = {Госстандарт России~: Изд-во стандартов},
year = 2001,
pagetotal = {IV, 27 с. : ил.; 29 см.},
- langid = {russian},
+ langid = {russian},
}
@Reference{standard2,
@@ -8279,7 +8296,7 @@
year = {cop. 2002},
pagetotal = 3,
series = {Система стандартов по информации, библиотечному и издательскому делу},
- langid = {russian},
+ langid = {russian},
}
@Reference{standard3,
@@ -8294,7 +8311,7 @@
year = 2006,
pagetotal = 18,
series = {Межгосударственный стандарт},
- langid = {russian},
+ langid = {russian},
}
@Article{guriev2012russia,
@@ -9026,7 +9043,7 @@
series = {Universitext},
pagetotal = 630,
language = {english},
- langid = {english},
+ langid = {english},
}
@Book{fitting:ilmtf,
@@ -9040,7 +9057,7 @@
location = {Amsterdam and London},
pagetotal = 191,
language = {english},
- langid = {english},
+ langid = {english},
}
@Book{moens:fskj,
@@ -10009,13 +10026,13 @@
note = "Towards Computer Aided Mathematics",
issn = "1570-8683",
doi = "http://dx.doi.org/10.1016/j.jal.2005.10.011",
- abstract = "This paper presents Automath encodings (which are also valid in LF/lambdaP)
- of various kinds of foundations of mathematics. Then it compares these
- encodings according to their size, to find out which foundation is the
- simplest. The systems analyzed in this way are two kinds of set theory
- (ZFC and NF), two systems based on Church's higher order logic
- (Isabelle/Pure and HOL), three kinds of type theory (the calculus of
- constructions, Luo's extended calculus of constructions, and
+ abstract = "This paper presents Automath encodings (which are also valid in
+ LF/lambdaP) of various kinds of foundations of mathematics. Then it
+ compares these encodings according to their size, to find out which
+ foundation is the simplest. The systems analyzed in this way are two
+ kinds of set theory (ZFC and NF), two systems based on Church's higher
+ order logic (Isabelle/Pure and HOL), three kinds of type theory (the
+ calculus of constructions, Luo's extended calculus of constructions, and
Martin-Löf's predicative type theory) and one foundation based on
category theory. The conclusions of this paper are that the simplest
system is type theory (the calculus of constructions), but that type
@@ -10369,3 +10386,21 @@
location = {London},
}
+ at Thesis{talashkin,
+ author = {Г. Н. Талашкин},
+ title = {Методы преодоления кризисных ситуаций в функционировании
+ инвестиционно-строительного комплекса России},
+ type = {phdthesis},
+ science = {экон. наук},
+ specialitycode ={08.00.05},
+ speciality = {Экономика и упр. нар. хоз-вом (экон. безопасность; экономика, орг. и
+ упр. предприятиями, отраслями, комплексами)},
+ titleaddon = {TITLEADDON},
+ credits = {С.-Петерб. гос. ун-т экономики и финансов},
+ _institution = {С.-Петерб. гос. ун-т экономики и финансов},
+ year = 2011,
+ language = {russian},
+ langid = {russian},
+ location = {СПб.},
+ pagetotal = 159,
+}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.tex 2017-02-05 23:18:52 UTC (rev 43146)
@@ -46,14 +46,6 @@
\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}]
- }
}
}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex 2017-02-05 23:18:52 UTC (rev 43146)
@@ -195,13 +195,30 @@
точки зрения совместимости с предыдущими версиями.
Более полный список изменений см. в \Apxref{apx:changelog}.
+\subsubsection*{Версия 1.12}
+
+\begin{trivlist}
+\item Изменения в оформлении диссертаций.
+ Определены новые поля, некоторые объявлены устаревшими
+ (\foreignlanguage{english}{deprecated}).
+ См.~\secref{sec:dissers}.
+\item Вернул изменения предыдущей версии, касающиеся заполнении поля \bibfield{science}
+ (устаревшее "--- \bibfield{major}).
+ Не все отрасли науки требуют слова «наук» (например, не требуют архитектура,
+ искусствоведение, культурология).
+ См.~\secref{sec:dissers}.
+\item Сдвоенные номера томов теперь разделяются косой чертой, как требует ГОСТ.
+ См. подробнее \secref{sec:newoptions}, опция \opt{doublevols}.
+\end{trivlist}
+
\subsubsection*{Версия 1.11a}
\begin{trivlist}
-\item При заполнении поля \bibfield{major} в описании диссертаций
+\item При заполнении полей \bibfield{major}/\bibfield{speciality} в описании диссертаций
теперь нужно писать «экон.», «физ.-мат.» и пр. вместо «экон. наук», «физ.-мат. наук» и
пр. См.~\secref{sec:dissers}.
\end{trivlist}
+
\subsubsection*{Версия 1.10}
\begin{trivlist}
@@ -636,7 +653,8 @@
booktitleaddon, type,\newline
\ensuremath\langle{\spotcolor ipc}, {\spotcolor location},
{\spotcolor number},
- {\spotcolor major}, {\spotcolor majorcode}\ensuremath\rangle \\
+ {\spotcolor science}, {\spotcolor specialitycode},
+ {\spotcolor speciality}\ensuremath\rangle \\
Сведения об ответственности & {\spotcolor credits}, {\spotcolor bookcredits},
editor, editora, editorb, editorc, afterword,
annotator, commentator, foreword, introduction, organization,
@@ -1308,27 +1326,46 @@
\subsection{Оформление диссертаций и авторефератов}
\label{sec:dissers}
-Для оформления диссертаций и автореферетов
-используйте записи типа \bibtype{thesis}. Поле \bibfield{type}
-определяет тип диссертации~--- магистерская (\opt{mathesis}), кандидатская (\opt{phdthesis}),
-докторская (\opt{docthesis})~--- или тип автореферата: кандидатская (\opt{phdautoref}),
-докторская (\opt{docautoref}).
+Для оформления диссертаций и автореферетов используйте записи типа \bibtype{thesis}.
+Поле \bibfield{type} определяет тип диссертации "--- магистерская (\opt{mathesis}),
+кандидатская (\opt{phdthesis}), докторская (\opt{docthesis}) "--- или тип автореферата:
+кандидатская (\opt{phdautoref}), докторская (\opt{docautoref}).
При других значениях поля \bibfield{type}, оно выводится как есть, причём поле
-\bibfield{major} (см.~ниже) игнорируются.
+\bibfield{science} (см.~ниже) игнорируется.
Для записей типа \bibtype{thesis} определены дополнительные поля:
\begin{fieldlist}
+\fielditem{science}{literal}\noitemspace%
\fielditem{major}{literal}
-Специальность в виде <<ист.>>, <<физ.-мат.>>, <<технических>> и т.\,д.
-Выводится как, например, «дис. \textellipsis\ канд. технических наук».
+Отрасль науки в виде «ист. наук», «физ.-мат. наук», «искусствоведения» и т.\,д.
+Выводится как «дис. \textellipsis\ канд. ист. наук», «дис. \textellipsis\
+канд. физ.-мат. наук», «дис. \textellipsis\ канд. искусствоведения» и т.\,д.
+Поля эквивалентны, можно использовать любое из них, но \bibfield{major} является
+устаревшим и не рекомендуется к использованию.
+
+\fielditem{specialitycode}{literal}\noitemspace%
+\fielditem{number}{literal}\noitemspace%
\fielditem{majorcode}{literal}
Код специальности в виде <<09.00.01>>, <<07.00.02>> и т.\,д.
+Поля эквивалентны, можно использовать любое из них, но \bibfield{majorcode} является
+устаревшим и не рекомендуется к использованию.
+
+\fielditem{speciality}{literal}
+
+Название специальности.
+Отделяется от кода специальности разделителем \cmd{specialitydelim}, который по умолчанию
+определён как тире с пробелами:
+
+\begin{lstlisting}[style=latex]
+\newcommand*{\specialitydelim}{\addnbspace\textemdash\space}
+\end{lstlisting}
+
\end{fieldlist}
Пример оформление диссертации:
@@ -1335,18 +1372,18 @@
\begin{lstlisting}[style=bibtex,escapechar=|]
@THESIS{belozerov_thesis,
- author = {|Белозеров, Иван Валентинович|},
- title = {|Религиозная политика Золотой Орды на Руси в XIII—XIV вв.|},
- media = {text},
- type = {phdthesis},
- major = {|ист.|},
- majorcode = {07.00.02},
- titleaddon = {|защищена 22.01.02~: утв. 15.07.02|},
- location = {|М.|},
- date = {2002},
- pagetotal = {215},
- addendum = {|Библиогр.: с. 202---213.~--- 04200201565|},
- langid = {russian},
+ author = {|Белозеров, Иван Валентинович|},
+ title = {|Религиозная политика Золотой Орды на Руси в XIII—XIV вв.|},
+ media = {text},
+ type = {phdthesis},
+ science = {|ист. наук|},
+ specialitycode = {07.00.02},
+ titleaddon = {|защищена 22.01.02~: утв. 15.07.02|},
+ location = {|М.|},
+ date = {2002},
+ pagetotal = {215},
+ addendum = {|Библиогр.: с. 202---213.~--- 04200201565|},
+ langid = {russian},
}
\end{lstlisting}
@@ -1645,7 +1682,20 @@
\end{table}
+\boolitem[true]{doublevols}
+Согласно \gostbibref{7.5.1.1}, сдвоенные номера тома или выпуска приводят через
+косую черту.
+В \biblatexgost это происходит по умолчанию, причём для всех языков.
+Данная опция позволяет отключить это поведение.
+При \kvopt{doublevols}{false} разделитель определяется настройками языка (командой
+\cmd{bibrangedash} в файлах \file{.lbx}).
+Кроме того, при \kvopt{doublevols}{true} разделитель определяется командой
+\cmd{doublevolsdelim}, определённой по умолчанию как косая черта:
+\begin{lstlisting}[style=latex]
+ \newcommand{\doublevolsdelim}{\slash}.
+\end{lstlisting}
+
\boolitem[false]{dropdates}
Опция определена для стилей \bibsty{gost-authoryear} и \bibsty{gost-authoryear-min}.
@@ -1945,25 +1995,6 @@
%Команда \cmd{autocite} определена таким образом, чтобы\ldots
-\subsection{Описание многотомных изданий}
-\label{sec:multivol}
-
-ГОСТ определяет два способа библиографического описания отдельного тома многотомного издания:
-
-\begin{bibexample}
-\item Детская энциклопедия. В 12 т. Т. 7. Человек. \dots\
-\item Человек. \dots\ (Детская энциклопедия: в 12 т., т. 7)\dots\
-\end{bibexample}
-
-В \biblatexgost реализован только первый вариант. Соответственно,
-в стиле \bibsty{gost-autoryear} при отсутствии автора ссылка производится на общий
-заголовок многотомного издания, а не на заголовок отдельного тома (тем более, что
-последний может и отсутствовать):
-
-\begin{bibexample}
-\item{} [Детская энциклопедия, 1966b, с.\,33]
-\end{bibexample}
-
\begin{comment}----------------------------------------------------------------
\subsection{Поле \bibfield{related}}
\label{sec:related}
@@ -1999,7 +2030,7 @@
определённой как:
\begin{lstlisting}[style=latex]
-\newcommand*{\mkgostheading}[1]{\mkbibemph{#1}}
+ \newcommand*{\mkgostheading}[1]{\mkbibemph{#1}}
\end{lstlisting}
В стиле \bibsty{gost-authoryear} заголовок, использованный в цитате,
@@ -2006,7 +2037,7 @@
форматируется отдельно:
\begin{lstlisting}[style=latex]
-\DeclareFieldFormat{citeheading}{#1}
+ \DeclareFieldFormat{citeheading}{#1}
\end{lstlisting}
Поскольку имена авторов~---
@@ -2023,6 +2054,52 @@
\newcommand*{\mkbibhdnamesuffix}[1]{\mkbibhdnamefamily{#1}}
\end{lstlisting}
+\subsection{Другие команды}
+\label{sec:other-commands}
+
+\begin{ltxsyntax}
+
+ \cmditem{doublevolsdelim}
+
+ Разделитель сдвоенных номеров при \kvopt{doublevols}{true}.
+ См.~\secref{sec:newoptions}.
+
+ По умолчанию:
+ \begin{lstlisting}[style=latex,belowskip=-\baselineskip]
+ \newcommand{\doublevolsdelim}{\slash}.
+ \end{lstlisting}
+
+ \cmditem{specialitydelim}
+
+ Разделитель между кодом специальности и специальностью.
+ См.~\secref{sec:dissers}.
+
+ По умолчанию:
+ \begin{lstlisting}[style=latex,belowskip=-\baselineskip]
+ \newcommand*{\specialitydelim}{\addnbspace\textemdash\space}.
+ \end{lstlisting}
+
+\end{ltxsyntax}
+
+\subsection{Описание многотомных изданий}
+\label{sec:multivol}
+
+ГОСТ определяет два способа библиографического описания отдельного тома многотомного издания:
+
+\begin{bibexample}
+\item Детская энциклопедия. В 12 т. Т. 7. Человек. \dots\
+\item Человек. \dots\ (Детская энциклопедия: в 12 т., т. 7)\dots\
+\end{bibexample}
+
+В \biblatexgost реализован только первый вариант. Соответственно,
+в стиле \bibsty{gost-autoryear} при отсутствии автора ссылка производится на общий
+заголовок многотомного издания, а не на заголовок отдельного тома (тем более, что
+последний может и отсутствовать):
+
+\begin{bibexample}
+\item{} [Детская энциклопедия, 1966b, с.\,33]
+\end{bibexample}
+
\subsection{Библиографический список}
\label{sec:gostbibliography}
@@ -2270,7 +2347,7 @@
\rl maintitle+volumes+parts+title & & & & & & + & + & + & & & & & & & & \tabularnewline
title & + & + & + & + & + & & & & + & + & + & + & + & + & + & +\tabularnewline
type & & & & & & & & & & + & + & & + & & & +\tabularnewline
-type+major & & & & & & & & & & & & & & & + & \tabularnewline
+type+speciality/major & & & & & & & & & & & & & & & + & \tabularnewline
event+venue+date & & & & & & & & + & & & & & & & & \tabularnewline
translation & + & + & + & + & + & + & + & + & + & + & + & & + & + & & +\tabularnewline%not in patent
\rl /\hfill byauthor & + & + & + & + & + & + & & & & + & + & + & + & + & +{*} & +\tabularnewline
@@ -2323,6 +2400,18 @@
\label{apx:changelog}
\begin{changelog}
+
+ \begin{release}{1.12}{05-02-2017}
+ \item Определена опция \opt{doublevols} и команда
+ \cmd{doublevolsdelim}\see{sec:newoptions}
+ \item Определены поля \bibfield{science}, \bibfield{specialitycode},
+ \bibfield{speciality}, \bibfield{number} для записей типа \bibtype{thesis}.
+ Поля \bibfield{major}, \bibfield{majorcode} объявлены устаревшими\see{sec:dissers}
+ \item Вернул изменения предыдущей версии, касающиеся заполнении поля \bibfield{major}.
+ Не все отрасли науки требуют слова «наук» (например, не требуют архитектура,
+ искусствоведения, культурология)\see{sec:dissers}
+ \end{release}
+
\begin{release}{1.11a}{28-01-2017}
\item При заполнении поля \bibfield{major} в описании диссертаций теперь нужно писать
«экон.», «физ.-мат.» и пр. вместо «экон. наук», «физ.-мат. наук» и пр. (в версии 1.11
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{biblatex-gost.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
% Biblatex-GOST data model
@@ -22,8 +22,9 @@
prioritynumber,
prioritycountry,
authorcountry,
- major,
- majorcode,
+ science,
+ specialitycode,
+ speciality,
heading,
}
@@ -89,7 +90,7 @@
}
\DeclareDatamodelEntryfields[thesis]{
- major,majorcode,
+ science,specialitycode,speciality,number,
}
\DeclareDatamodelEntryfields[online]{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{biblatex-gost.def}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
% these declarations should be here, not in lbx, to be initialized for all languages
\NewBibliographyString{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic-min.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-alphabetic}
\AtEveryBibitem{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic-min.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{gost-alphabetic}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic-min.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyvt}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{alphabetic}
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear-min.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-authoryear}
\AtEveryBibitem{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear-min.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{gost-authoryear}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear-min.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict,
dropdates=false,
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote-min.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-inline-min}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote-min.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{gost-footnote}
\renewbibmacro*{cite:clearfields}{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote-min.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-inline}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{gost-inline}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline-min.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-inline}
\AtEveryBibitem{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline-min.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{gost-inline}
\renewbibmacro*{cite:clearfields}{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline-min.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\DeclareLabelname
[inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric-min.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-numeric}
\AtEveryBibitem{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric-min.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{gost-numeric}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric-min.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
\ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric.cbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{dashed=false,citeisbn,citeurl,citedoi,citeeprint}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric.dbx}
-[2017/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
\blx at inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,8 +1,8 @@
\ProvidesFile{gost-standard.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
-\def\bbx at gost@date{2017/01/28}
-\def\bbx at gost@version{1.11a}
+\def\bbx at gost@date{2017/02/05}
+\def\bbx at gost@version{1.12}
\@ifpackagelater{biblatex}{2016/03/03}
{}
@@ -120,6 +120,12 @@
\DeclareBibliographyOption{movenames}[true]{%
\gdef\blx at opt@movenames{#1}}
+\newtoggle{bbx:gost:doublevols}
+\DeclareBibliographyOption{doublevols}[true]{%
+ \ifstrequal{#1}{true}
+ {\toggletrue{bbx:gost:doublevols}}
+ {\togglefalse{bbx:gost:doublevols}}}
+
\AtEndOfPackage{%
\ifdefstring{\blx at opt@movenames}{true}
{\DeclareStyleSourcemap{
@@ -184,9 +190,13 @@
}
\map{
\pertype{thesis}
- \step[fieldsource=speciality, fieldtarget=major]
- \step[fieldsource=specialitycode, fieldtarget=majorcode]
- \step[fieldsource=number, fieldtarget=majorcode]
+ \pertype{masterthesis}
+ \pertype{phdthesis}
+ \pertype{candthesis}
+ \pertype{docthesis}
+ \step[fieldsource=major, fieldtarget=speciality]
+ \step[fieldsource=majorcode, fieldtarget=specialitycode]
+ \step[fieldsource=number, fieldtarget=specialitycode]
}
}
}
@@ -219,9 +229,13 @@
}
\map{
\pertype{thesis}
- \step[fieldsource=speciality, fieldtarget=major]
- \step[fieldsource=specialitycode, fieldtarget=majorcode]
- \step[fieldsource=number, fieldtarget=majorcode]
+ \pertype{masterthesis}
+ \pertype{phdthesis}
+ \pertype{candthesis}
+ \pertype{docthesis}
+ \step[fieldsource=major, fieldtarget=speciality]
+ \step[fieldsource=majorcode, fieldtarget=specialitycode]
+ \step[fieldsource=number, fieldtarget=specialitycode]
}
}
}
@@ -240,7 +254,8 @@
related=true,
alldates=short,
eventdate=comp,
- blockpunct=emdash}
+ blockpunct=emdash,
+ doublevols=true}
\newbibmacro*{cbx:bookibid:check}[2]{#2}
@@ -255,30 +270,34 @@
\DeclareFieldFormat{journaltitle}{#1}
\DeclareFieldFormat{issuetitle}{#1}
\DeclareFieldFormat{maintitle}{#1}
-\DeclareFieldFormat*{volume}{%
- \iffieldnums{volume}
- {\ifbibstring{volume}
- {\bibstring{volume}\addabbrvspace#1}
+
+% volume etc
+%
+% helper for printing volume/book/number/part/issue
+\newcommand{\printvol}[2]{%
+ \ifnumcomp{\rangelen{#2}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
+ \iffieldnums{#2}
+ {\ifbibstring{#2}
+ {\bibstring{#2}\addabbrvspace#1}
{#1}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat*{volume}{\printvol{#1}{volume}}
\DeclareFieldFormat[article,periodical]{volume}{%
+ \ifnumcomp{\rangelen{volume}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
\ifbibstring{volume}
{\bibstring{jourvol}\addabbrvspace#1}
{#1}}
-\DeclareFieldFormat*{book}{%
- \iffieldnums{book}
- {\ifbibstring{book}
- {\bibstring{book}\addabbrvspace#1}
- {#1}}
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
-\DeclareFieldFormat*{part}{%
- \iffieldnums{part}
- {\ifbibstring{part}
- {\bibstring{part}\addabbrvspace#1}
- {#1}}
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat*{book}{\printvol{#1}{book}}
+\DeclareFieldFormat*{part}{\printvol{#1}{part}}
\DeclareFieldFormat{seriesnumber}{#1}%
\DeclareFieldFormat*{number}{%
+ \ifnumcomp{\rangelen{number}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
\iffieldnums{number}
{\ifbibstring{number}
{\bibsstring{number}\addabbrvspace#1}
@@ -289,6 +308,19 @@
\ifbibstring{number}
{\bibsstring{number}\addnbspace#1}
{#1}}%
+\DeclareFieldFormat{issue}{\printvol{#1}{issue}}
+\DeclareFieldFormat[article,periodical]{issue}{%
+ \ifnumcomp{\rangelen{issue}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
+ \iffieldnums{issue}
+ {\ifbibstring{issue}%
+ {\bibstring{issue}\addabbrvspace#1}%
+ {\unspace\adddot#1}}%
+ {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+
+% volumes etc, involumes etc
+%
\newbibmacro*{volumes/parts/books/issues}[2]{%
\iffieldnum{#1}
{\ifbibstring{#1}
@@ -310,18 +342,9 @@
\DeclareFieldFormat{inbooks}{\usebibmacro{in+}{books}{#1}}
\DeclareFieldFormat{inparts}{\usebibmacro{in+}{parts}{#1}}
\DeclareFieldFormat{inissues}{\usebibmacro{in+}{issues}{#1}}
-\DeclareFieldFormat{issue}{%
- \iffieldnums{issue}
- {\ifbibstring{issue}
- {\bibstring{issue}\addabbrvspace#1}
- {#1}}
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
-\DeclareFieldFormat[article,periodical]{issue}{%
- \iffieldnums{issue}
- {\ifbibstring{issue}%
- {\bibstring{issue}\addabbrvspace#1}%
- {\unspace\adddot#1}}%
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+
+% dates
+%
\DeclareFieldFormat{date}{%
\iffieldundef{endyear}
{#1}
@@ -361,6 +384,11 @@
\iffieldnum{edition}
{\mkbibordedition{#1}\addnbspace\bibstring{edition}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat[thesis]{type}{%
+ \ifbibstring{#1}{\biblstring{#1}%
+ \setunit*{\addspace}%
+ \printfield{science}}%
+ {#1}}
\DeclareFieldFormat{prioritycountry}{%
\ifbibxstring{\thefield{prioritycountry}}
{\bibcpstring{\thefield{prioritycountry}}}
@@ -444,7 +472,9 @@
\renewcommand*{\bibpagespunct}{\addperiod\space}
\renewcommand*{\subtitlepunct}{\addcolon\space}
\newcommand*{\respdelim}{\addnbspace/\space}% delimiter before "credits"
-\newcommand*{\resppunct}{\addsemicolondelim}% punctuation between "credits" items
+\newcommand*{\resppunct}{\addsemicolondelim}% between "credits" items
+\newcommand*{\specialitydelim}{\addnbspace\textemdash\space}% between specialitycode and speciality
+\newcommand{\doublevolsdelim}{\slash}% between double volumes/numbers/...
% auxillary macros for volsorder handling
\newcounter{blx at gost@pointer}%
@@ -1988,8 +2018,10 @@
\setunit*{\addcolondelim}%
\printfield{type}%
\setunit*{\addcolondelim}%
- \printfield{majorcode}}%
- \setunit*{\addcolondelim}%
+ \printfield{specialitycode}%
+ \setunit*{\specialitydelim}%
+ \printfield{speciality}}%
+ \setunit{\addcolondelim}%
\printfield{titleaddon}%
\clearfield{media}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx 2017-02-05 23:18:29 UTC (rev 43145)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx 2017-02-05 23:18:52 UTC (rev 43146)
@@ -1,20 +1,18 @@
\ProvidesFile{russian-gost.lbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\InheritBibliographyExtras{russian}
\DeclareBibliographyStrings{%
inherit = {russian},%------------------------------------------------------------
- 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} наук}},
+ 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\ д-ра}},
countryru = {{Российская Федерация}{Рос\adddotspace Федерация}},
countryussr = {{СССР}{СССР}},
patentru = {{патент Российской Федерации}{пат\adddotspace Рос\adddotspace Федерации}},
More information about the tex-live-commits
mailing list