summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-15 21:21:56 +0000
committerKarl Berry <karl@freefriends.org>2016-03-15 21:21:56 +0000
commit377510254c82d45bfbe00cd6fa3653afab02121e (patch)
tree83131f5d7c5db9d172ff82980b42831b28377412 /Master/texmf-dist
parentf1db2ef1c4816d9fde235c96acdcf225b928c0b2 (diff)
biblatex-gost (15mar16)
git-svn-id: svn://tug.org/texlive/trunk@40031 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdfbin619473 -> 620686 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdfbin243492 -> 243509 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex54
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx9
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx112
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx2
28 files changed, 128 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/README b/Master/texmf-dist/doc/latex/biblatex-gost/README
index 0df0fa76725..09307923628 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gost/README
+++ b/Master/texmf-dist/doc/latex/biblatex-gost/README
@@ -4,7 +4,7 @@ For documentation and release notes please refer to biblatex-gost.pdf.
The documentation is mainly in Russian. Formatting examples for various
bibliography entries may be found in biblatex-gost-examples.pdf.
-To use the current version of the package you will need biblatex 3.2/biber 2.3
+To use the current version of the package you will need biblatex 3.3/biber 2.4
or later. Using the styles is not different from using any other biblatex styles,
please refer to the biblatex documentation.
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 7286c4c0a27..67319156fea 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
Binary files 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 4f427e7774b..63e39503437 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
Binary files 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 ad1fafa2e23..ea4800e7ff5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
@@ -175,8 +175,8 @@ maintained.
Для работы \biblatexgost версии \makeatletter\bbx@gost@version\makeatother\
требуются, как минимум,
-\biblatex~3.2\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.2/}
-и \biber~2.3\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.3/}.
+\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/}.
%(текущие версии на CTAN).
Пакет может не работать с предыдущими версиями.
@@ -187,6 +187,13 @@ maintained.
точки зрения совместимости с предыдущими версиями.
Более полный список изменений см. в \Apxref{apx:changelog}.
+\subsubsection*{Версия 1.5}
+
+\begin{trivlist}
+\item Изменились команды формата имён в
+ заголовках (\secref{sec:headingformat}).
+\end{trivlist}
+
\subsubsection*{Версия 1.4}
\begin{trivlist}
@@ -204,13 +211,13 @@ maintained.
означает, что число авторов/редакторов больше 3-х. Подробнее см.~\secref{sec:newoptions}.
\end{trivlist}
-\subsubsection*{Версия 0.9.2}
+% \subsubsection*{Версия 0.9.2}
-\begin{trivlist}
-\item Добавлено поле \bibfield{journalcredits}
-\item Удалена настройка языка цитат, поскольку эта функция поддерживается
- в \biblatex, начиная с версии 2.8a (опция \opt{language}).
-\end{trivlist}
+% \begin{trivlist}
+% \item Добавлено поле \bibfield{journalcredits}
+% \item Удалена настройка языка цитат, поскольку эта функция поддерживается
+% в \biblatex, начиная с версии 2.8a (опция \opt{language}).
+% \end{trivlist}
% \subsubsection*{Версия 0.9.1}
%
@@ -1844,14 +1851,14 @@ gost-inline & false & true \\
а также редакторов или переводчиков при использовании опций \opt{useeditor} и/или
\opt{usetranslator}~--- фактически выполняют роль заголовка, они по умолчанию выводятся
тем же форматом. Этот вывод можно изменить, переопределив команды
-\cmd{mkbibhdnamelast}, \cmd{mkbibhdnamefirst}, \cmd{mkbibhdnameprefix} и
-\cmd{mkbibhdnameaffix}. По умолчанию они определены так:
+\cmd{mkbibhdnamefamily}, \cmd{mkbibhdnamegiven}, \cmd{mkbibhdnameprefix} и
+\cmd{mkbibhdnamesuffix}. По умолчанию они определены так:
\begin{lstlisting}[style=latex]
-\newcommand*{\mkbibhdnamelast}[1]{\mkgostheading{#1}}
-\newcommand*{\mkbibhdnamefirst}[1]{\mkbibhdnamelast{#1}}
-\newcommand*{\mkbibhdnameprefix}[1]{\mkbibhdnamelast{#1}}
-\newcommand*{\mkbibhdnameaffix}[1]{\mkbibhdnamelast{#1}}
+ \newcommand*{\mkbibhdnamefamily}[1]{\mkgostheading{#1}}
+ \newcommand*{\mkbibhdnamegiven}[1]{\mkbibhdnamefamily{#1}}
+ \newcommand*{\mkbibhdnameprefix}[1]{\mkbibhdnamefamily{#1}}
+ \newcommand*{\mkbibhdnamesuffix}[1]{\mkbibhdnamefamily{#1}}
\end{lstlisting}
\subsection{Библиографический список}
@@ -1863,7 +1870,8 @@ gost-inline & false & true \\
В пакете определяется окружение \texttt{gostbibliography}, которое можно использовать следующим
образом:
\begin{lstlisting}[style=latex]
- \printbibliography[env=gostbibliography,sorting=ntvy]
+ \newrefcontext[sorting=ntvy]
+ \printbibliography[env=gostbibliography]
\end{lstlisting}
Эта команда печатает библиографический список в соответствии с \gostbibname.
Он оформляется как простой алфавитный список без нумерации,
@@ -2152,6 +2160,17 @@ pageref & + & + & + & + & + & + & + & +
\begin{changelog}
+ \begin{release}{1.5}{14-03-2016}
+ \item Исправлен вывод имён, используемых как заголовок (в связи с
+ изменением \cmd{DeclareNameFormat} в \biblatex 3.3.
+ В связи с этим изменились команды формата имён
+ в заголовках.\see{sec:headingformat}
+ \item Тип полей \bibfield{number}, \bibfield{book}, \bibfield{part},
+ \bibfield{volume} и \bibfield{issue} изменён на \texttt{range}.
+ \item Опция \texttt{firtsinits} заменена на \texttt{giveinits}
+ (deprecated в \biblatex 3.3).
+ \end{release}
+
\begin{release}{1.4}{04-02-2016}
\item Исправлен вывод \bibtype{article} для электронных публикаций (добавлен
вывод \bibfield{date} и \bibfield{specdata}).
@@ -2356,3 +2375,8 @@ pageref & + & + & + & + & + & + & + & +
\end{changelog}
\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
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 0e5454b8378..0187f32603d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx
@@ -1,7 +1,14 @@
% Biblatex-GOST data model
-\DeclareDatamodelFields[type=field, datatype=literal]{
+\DeclareDatamodelFields[type=field, datatype=range]{
+ number,
book,
+ part,
+ volume,
+ issue,
+}
+
+\DeclareDatamodelFields[type=field, datatype=literal]{
books,parts,issues,
volsorder,
sortvolume,
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 9e00b2f92bf..ecaf6047322 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 820f01ccc02..9808fa29493 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 7f934ce0042..4e0c8b8ab44 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 6ba7a5f4005..73c98ddd9c9 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 bd04ae24d57..d2c82fa3478 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 a44671a7576..6a28c5c647c 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 6faf2c777a4..a3ebfe2a74a 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 d2f79c22224..adaa31bd808 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.bbx}
-[2016/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 93bbe29c5b4..969681408a1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.cbx}
-[2016/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\space biblatex-gost styles]
\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict,
singletitle=false,labeldate,labeltitleyear,uniquename=init,
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx
index 8b24731380e..ec349302211 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 84099930ebb..825bafff650 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 b02a2d45e1f..8072a6a0ca0 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 9b80407e5ae..fa273155373 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 4853c771575..138db969511 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 500f9cbc037..7953edfd51f 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 f043170eec5..1f242a22076 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.bbx}
-[2016/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 1814ec4f6a9..b6becebb75e 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 ee9a64776e8..a0dee89ffda 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 f05261f135c..bdac9a1f4a5 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 cebb7abc2a4..118c4c139d3 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 02c83c76df4..5b8e8e81b28 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\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 9d576746deb..5753d7c2716 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
@@ -1,14 +1,14 @@
\ProvidesFile{gost-standard.bbx}
-[2016/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\space biblatex-gost styles]
-\def\bbx@gost@date{2016/02/04}
-\def\bbx@gost@version{1.4}
+\def\bbx@gost@date{2016/03/14}
+\def\bbx@gost@version{1.5}
-\@ifpackagelater{biblatex}{2015/12/22}
+\@ifpackagelater{biblatex}{2016/03/03}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {This version of 'biblatex-gost' requires biblatex v3.2 or
+ {This version of 'biblatex-gost' requires biblatex v3.3 or
later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
@@ -123,7 +123,7 @@
dashed=false,
singletitle=false,
movenames=true,
- firstinits,
+ giveninits,
volsorder=vbpi,
related=true}
@@ -141,7 +141,7 @@
\DeclareFieldFormat{issuetitle}{#1}
\DeclareFieldFormat{maintitle}{#1}
\DeclareFieldFormat*{volume}{%
- \iffieldnum{volume}
+ \iffieldnums{volume}
{\ifbibstring{volume}
{\bibstring{volume}\addabbrvspace#1}
{}}
@@ -151,20 +151,20 @@
{\bibstring{jourvol}\addabbrvspace#1}
{}}
\DeclareFieldFormat*{book}{%
- \iffieldnum{book}
+ \iffieldnums{book}
{\ifbibstring{book}
{\bibstring{book}\addabbrvspace#1}
{}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
\DeclareFieldFormat*{part}{%
- \iffieldnum{part}
+ \iffieldnums{part}
{\ifbibstring{part}
{\bibstring{part}\addabbrvspace#1}
{}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
\DeclareFieldFormat{seriesnumber}{#1}%
\DeclareFieldFormat*{number}{%
- \iffieldnum{number}
+ \iffieldnums{number}
{\ifbibstring{number}
{\bibsstring{number}\addabbrvspace#1}
{\unspace\adddot#1}}%
@@ -196,7 +196,7 @@
\DeclareFieldFormat{inparts}{\usebibmacro{in+}{parts}{#1}}
\DeclareFieldFormat{inissues}{\usebibmacro{in+}{issues}{#1}}
\DeclareFieldFormat{issue}{%
- \iffieldnum{issue}
+ \iffieldnums{issue}
{\ifbibstring{issue}
{\bibstring{issue}\addabbrvspace#1}
{}}
@@ -252,61 +252,65 @@
{\bibcpstring{\thefield{prcountry}}}
{#1}}
-\DeclareNameAlias{sortname}{last-first}
+\DeclareNameAlias{default}{given-family}
-\DefineBibliographyExtras{french}{\restorecommand\mkbibnamelast}
+\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
-% format for author is defined separately, because \mkbibnamelast, etc. cannot be
+% Format for names (authors, editors, translators) used as headings.
+% It is defined separately, because \mkbibnamefamily, etc. cannot be
% used, since they affect all names, not only headings
-\DeclareNameFormat{author}{%
- \iftoggle{bbx:gostbibliography}
- {\ifnumequal{\value{listcount}}{1}
- {\iffirstinits
- {\usebibmacro{authorname:last-first}{#1}{#4}{#5}{#7}}
- {\usebibmacro{authorname:last-first}{#1}{#3}{#5}{#7}}}
- {}}
- {\iffirstinits
- {\usebibmacro{authorname:last-first}{#1}{#4}{#5}{#7}}
- {\usebibmacro{authorname:last-first}{#1}{#3}{#5}{#7}}%
- \usebibmacro{name:andothers}}}
-\newcommand*{\mkgostheading}[1]{\mkbibemph{#1}}%\nocorr}}
-\DeclareFieldFormat{heading}{%
- \mkgostheading{#1}\addperiod\space}
-\newcommand*{\mkbibhdnamelast}[1]{\mkgostheading{#1}}
-\newcommand*{\mkbibhdnamefirst}[1]{\mkbibhdnamelast{#1}}
-\newcommand*{\mkbibhdnameprefix}[1]{\mkbibhdnamelast{#1}}
-\newcommand*{\mkbibhdnameaffix}[1]{\mkbibhdnamelast{#1}}
-\newbibmacro*{authorname:last-first}[4]{%
+\DeclareNameFormat{heading}{%
+ \nameparts{#1}%
+ \ifgiveninits
+ {\usebibmacro{headingname:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{headingname:family-given}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}%
+ \usebibmacro{name:andothers}}
+\newbibmacro*{headingname:family-given}[4]{%
\ifuseprefix
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifblank{#3}{}{%
+ \ifempty{#3}{}{%
\ifcapital
{\mkbibhdnameprefix{\MakeCapital{#3}}\isdot}
{\mkbibhdnameprefix{#3}\isdot}%
- \ifpunctmark{'}{}{\bibnamedelimc}}%
- \mkbibhdnamelast{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibhdnameaffix{#4}\isdot}%
- \ifblank{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibhdnamefirst{#2}\isdot}}
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibhdnamefamily{#1}\isdot
+ \ifempty{#4}{}{\bibnamedelimd\mkbibhdnamesuffix{#4}\isdot}%
+ \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibhdnamegiven{#2}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibhdnamelast{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibhdnameaffix{#4}\isdot}%
- \ifblank{#2#3}{}{\revsdnamepunct}%
- \ifblank{#2}{}{\bibnamedelimd\mkbibhdnamefirst{#2}\isdot}%
- \ifblank{#3}{}{\bibnamedelimd\mkbibhdnameprefix{#3}\isdot}}}
-\DeclareNameAlias{editor}{author}
-\DeclareNameAlias{editora}{editor}
-\DeclareNameAlias{editorb}{editor}
-\DeclareNameAlias{editorc}{editor}
-\DeclareNameAlias{translator}{author}
+ \mkbibhdnamefamily{#1}\isdot
+ \ifempty{#4}{}{\bibnamedelimd\mkbibhdnamesuffix{#4}\isdot}%
+ \ifempty{#2#3}{}{\revsdnamepunct}%
+ \ifempty{#2}{}{\bibnamedelimd\mkbibhdnamegiven{#2}\isdot}%
+ \ifempty{#3}{}{\bibnamedelimd\mkbibhdnameprefix{#3}\isdot}}}
+\newcommand*{\mkgostheading}[1]{\mkbibemph{#1}}%\nocorr}}
+\DeclareFieldFormat{heading}{%
+ \mkgostheading{#1}\addperiod\space}
+\newcommand*{\mkbibhdnamefamily}[1]{\mkgostheading{#1}}
+\newcommand*{\mkbibhdnamegiven}[1]{\mkbibhdnamefamily{#1}}
+\newcommand*{\mkbibhdnameprefix}[1]{\mkbibhdnamefamily{#1}}
+\newcommand*{\mkbibhdnamesuffix}[1]{\mkbibhdnamefamily{#1}}
\renewcommand*{\revsdnamepunct}{\addspace}%
-\DeclareNameFormat{last-first:full}{%
+\DeclareNameFormat{family-given:full}{%
\begingroup%
\renewcommand*{\revsdnamepunct}{\addspace}%
- \usebibmacro{name:last-first}{#1}{#3}{#5}{#7}%
+ \nameparts{#1}%
+ \usebibmacro{name:family-given}
+ {\namepartprefix}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartsuffix}
\endgroup}
% FORMATTING COMMANDS
@@ -1083,7 +1087,7 @@
\setunit*{\labelnamepunct}%
\usebibmacro{thesistitle}%
\setunit{\respdelim}%
- \printnames[last-first:full]{author}%
+ \printnames[family-given:full]{author}%
\newunit\newblock
\printlist[semicolondelim]{specdata}%
\newunit
@@ -1982,7 +1986,7 @@
}
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
- {\printnames{author}%
+ {\printnames[heading]{author}%
\setunit{\addcomma\space}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{authorstrg}}
@@ -2000,7 +2004,7 @@
}
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
- {\printnames{editor}%
+ {\printnames[heading]{editor}%
\setunit{\addcomma\space}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
@@ -2022,7 +2026,7 @@
}
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
- {\printnames{translator}%
+ {\printnames[heading]{translator}%
\setunit{\addcomma\space}%
\usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
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 0f017cbdd1e..1d2a134ec42 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/02/04\space v1.4\space biblatex-gost styles]
+[2016/03/14\space v1.5\space biblatex-gost styles]
\InheritBibliographyExtras{russian}