diff options
48 files changed, 189 insertions, 101 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf Binary files differindex a2858f78e2c..d824aa86341 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf Binary files differindex 2cc29f94552..a3b594515ca 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex index 9b6f3696d35..912ba821a5c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -195,6 +195,16 @@ This package is maintained. точки зрения совместимости с предыдущими версиями. Более полный список изменений см. в \Apxref{apx:changelog}. +\subsubsection*{Версия 1.16} + +\begin{trivlist} +\item \bibfield{origlanguage} и \bibfield{bookoriglanguage} теперь могут быть списками + (требуется \biblatex~3.8). + Если вы работаете с этими полями прямо, то нужно \cmd{printfield}, \cmd{iffieldundef} + и пр. заменить на \cmd{printlist}, \cmd{iflistundef} и пр. + Если не работаете, то для вас это изменение не важно. +\end{trivlist} + \subsubsection*{Версия 1.15} \begin{trivlist} @@ -215,75 +225,75 @@ This package is maintained. См. описание опции \opt{otherlangs}, \secref{sec:newoptions}. \end{trivlist} -\subsubsection*{Версия 1.12} +% \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} +% \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} +% \subsubsection*{Версия 1.11a} -\begin{trivlist} -\item При заполнении полей \bibfield{major}/\bibfield{speciality} в описании диссертаций - теперь нужно писать «экон.», «физ.-мат.» и пр. вместо «экон. наук», «физ.-мат. наук» и - пр. См.~\secref{sec:dissers}. -\end{trivlist} +% \begin{trivlist} +% \item При заполнении полей \bibfield{major}/\bibfield{speciality} в описании диссертаций +% теперь нужно писать «экон.», «физ.-мат.» и пр. вместо «экон. наук», «физ.-мат. наук» и +% пр. См.~\secref{sec:dissers}. +% \end{trivlist} -\subsubsection*{Версия 1.10} +% \subsubsection*{Версия 1.10} -\begin{trivlist} -\item Исправлено сокращение <<док.>> на <<д-ра>>. -\end{trivlist} +% \begin{trivlist} +% \item Исправлено сокращение <<док.>> на <<д-ра>>. +% \end{trivlist} -\subsubsection*{Версия 1.9} +% \subsubsection*{Версия 1.9} -\begin{trivlist} -\item Версия не совместима с \biblatex версий ниже 3.5. -\item В \biblatex~3.5 для работы механизма пропуска даты для ссылок на уникальные работы - недостаточно опции \opt{singletitle}, нужно установить дополнительно опцию - \opt{uniquebaretitle} или воспользоваться опцией \biblatexgost \opt{dropdates}. - Подробнее см.~\secref{sec:newoptions}. -\end{trivlist} +% \begin{trivlist} +% \item Версия не совместима с \biblatex версий ниже 3.5. +% \item В \biblatex~3.5 для работы механизма пропуска даты для ссылок на уникальные работы +% недостаточно опции \opt{singletitle}, нужно установить дополнительно опцию +% \opt{uniquebaretitle} или воспользоваться опцией \biblatexgost \opt{dropdates}. +% Подробнее см.~\secref{sec:newoptions}. +% \end{trivlist} -\subsubsection*{Версии 1.8, 1.7, 1.6} +% \subsubsection*{Версии 1.8, 1.7, 1.6} -\begin{trivlist} -\item Нет критических изменений. -\end{trivlist} +% \begin{trivlist} +% \item Нет критических изменений. +% \end{trivlist} -\subsubsection*{Версия 1.5} +% \subsubsection*{Версия 1.5} -\begin{trivlist} -\item Изменились команды формата имён в - заголовках (\secref{sec:headingformat}). -\end{trivlist} +% \begin{trivlist} +% \item Изменились команды формата имён в +% заголовках (\secref{sec:headingformat}). +% \end{trivlist} -\subsubsection*{Версия 1.4} +% \subsubsection*{Версия 1.4} -\begin{trivlist} -\item Внутреннее имя списка сокращений изменено на \texttt{shorthand} (было - \texttt{shorthands}), в соответсвие с изменением в \texttt{biblatex}. - Если вы не используете этот список явно, например, в \cmd{printbiblist}, вас это - изменение не затронет. -\end{trivlist} +% \begin{trivlist} +% \item Внутреннее имя списка сокращений изменено на \texttt{shorthand} (было +% \texttt{shorthands}), в соответсвие с изменением в \texttt{biblatex}. +% Если вы не используете этот список явно, например, в \cmd{printbiblist}, вас это +% изменение не затронет. +% \end{trivlist} -\subsubsection*{Версия 1.1} +% \subsubsection*{Версия 1.1} -\begin{trivlist} -\item При \kvopt{movenames}{true} (установлено по умолчанию) `\texttt{and others}' - в поле \bibfield{author/editor} - означает, что число авторов/редакторов больше 3-х. Подробнее см.~\secref{sec:newoptions}. -\end{trivlist} +% \begin{trivlist} +% \item При \kvopt{movenames}{true} (установлено по умолчанию) `\texttt{and others}' +% в поле \bibfield{author/editor} +% означает, что число авторов/редакторов больше 3-х. Подробнее см.~\secref{sec:newoptions}. +% \end{trivlist} % \subsubsection*{Версия 0.9.2} @@ -2466,6 +2476,13 @@ pageref & + & + & + & + & + & + & + & + \begin{changelog} + \begin{release}{1.16}{23-08-2017} + \item \bibfield{origlanguage} и \bibfield{bookoriglanguage} теперь могут быть списками + (требуется \biblatex~3.8). + \item Добавлена настройка вывода страниц для галицийского языка. + См. описание опции \opt{otherlangs}. + \end{release} + \begin{release}{1.15}{27-06-2017} \item Добавлен пробел перед двоеточием "--- разделителем заголовка и подзаголовка\see{sec:other-commands} 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 5aa08abe8f8..8fc2b260cd4 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\space biblatex-gost data model] % Biblatex-GOST data model @@ -45,9 +45,16 @@ \DeclareDatamodelFields[type=field, datatype=key]{ media, - bookoriglanguage, } +\@ifpackagelater{biblatex}{2016/12/06} %biblatex 3.8+ +{\DeclareDatamodelFields[type=list, datatype=key]{ + bookoriglanguage, +}} +{\DeclareDatamodelFields[type=field, datatype=key]{ + bookoriglanguage, +}} + \DeclareDatamodelFields[type=list, datatype=literal]{ specdata, credits, 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 7ba6248442c..29679331e43 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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/brazilian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx index 90191c08884..b05c290d05a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{brazilian-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{brazilian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx index 116933792c7..938971f5336 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{catalan-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{catalan} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx index 18c7fe2e0ae..840be09863f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{croatian-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{croatian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx index 3c9050f6b1b..16159836183 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{russian-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{english} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx new file mode 100644 index 00000000000..fd6fd3584c6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx @@ -0,0 +1,11 @@ +\ProvidesFile{galician-gost.lbx} +[2017/08/23\space v1.16\space biblatex-gost styles] + +\InheritBibliographyExtras{galician} + +\DeclareBibliographyStrings{% + inherit = {galician},%------------------------------------------------------------ + pages = {{p\'axinas}{p\adddot}}, +} + +\endinput 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 b339a07bb6b..0a3f3a83cd6 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 14ef7f91475..cd0480ce1c6 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 62490d7dac6..aa9c84af189 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 caa9033bef4..302ee6b2f04 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 857e3a92b3a..3d92f52ed7a 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 fe60c9488b4..12789a6d84c 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 0c002bf9847..a22e59cf3d1 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 ff61f0798b0..0ed0c81ffb2 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 ec5a5d294f0..1f1594722c3 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 8ddd8235e43..13481cc53ea 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 5be83c078e2..990dd25421c 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 8881e3cc713..5040f1f7b11 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 a3c82aa89be..fd3766a9c02 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 2d641f5ccb3..289f01b4774 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 a11ed9ae485..20757b88d5c 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 21b41c0af13..aba5220ba0e 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 222fecdb43a..6748a1999c2 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 3274e31825e..e1115d700e1 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 e8839af25b2..3d44b3908ec 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 359bfb4b858..ae23b44105a 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 56925335df9..0293a186e37 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 6d837ecef79..19a6bf67caa 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 1173d52540a..86ce8e4bf9c 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 60fda625713..e8e421012a0 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 996b297fd9e..7e3df34c1fd 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 e85107304e6..09a2e459e90 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 b521862cbce..936b72ba37d 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 e6171809954..0afbef682d9 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 f297a294c91..c697422d6aa 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\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 0038a7bef87..c63237de594 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/06/27\space v1.15\space biblatex-gost data model] +[2017/08/23\space v1.16\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 69182291aaf..8962185e25e 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/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] -\def\bbx@gost@date{2017/06/27} -\def\bbx@gost@version{1.15} +\def\bbx@gost@date{2017/08/23} +\def\bbx@gost@version{1.16} \@ifpackagelater{biblatex}{2016/09/07} {} @@ -52,6 +52,7 @@ \DeclareLanguageMapping{catalan}{catalan-gost} \DeclareLanguageMapping{croatian}{croatian-gost} \DeclareLanguageMapping{english}{english-gost} + \DeclareLanguageMapping{galician}{galician-gost} \DeclareLanguageMapping{greek}{greek-gost} \DeclareLanguageMapping{icelandic}{icelandic-gost} \DeclareLanguageMapping{italian}{italian-gost} @@ -62,6 +63,7 @@ \DeclareLanguageMapping{catalan}{catalan} \DeclareLanguageMapping{croatian}{croatian} \DeclareLanguageMapping{english}{english} + \DeclareLanguageMapping{galician}{galician} \DeclareLanguageMapping{greek}{greek} \DeclareLanguageMapping{icelandic}{icelandic} \DeclareLanguageMapping{italian}{italian} @@ -507,6 +509,25 @@ % macros and formats for printing origlanguage and bookoriglanguage. % made special to simplify making them lists +\@ifpackagelater{biblatex}{2016/12/06} %biblatex 3.8+ +{ +% \DeclareListFormat{origlanguage}{% +% \bibstring{from#1}} + +% used for printing origlanguage and bookoriglanguage +\newcommand*{\lbx@gost@lfromlang}[1]{% + \iflistundef{#1} + {\unspace} + {\printlist[lfromoriglanguage]{#1}}} +\newcommand*{\lbx@gost@sfromlang}[1]{% + \iflistundef{#1} + {\unspace} + {\printlist[sfromoriglanguage]{#1}}} +% \renewcommand*{\lbx@lfromlang}{\lbx@gost@lfromlang{origlanguage}} +% \renewcommand*{\lbx@sfromlang}{\lbx@gost@sfromlang{origlanguage}} +\newcommand*{\blx@gost@iflangundef}[3]{\iflistundef{#1}{#2}{#3}} +\newcommand*{\blx@gost@iflangsequal}[4]{\iflistsequal{#1}{#2}{#3}{#4}}} +{ \DeclareFieldFormat{origlanguage}{% \bibstring{from#1}} @@ -522,6 +543,7 @@ % \renewcommand*{\lbx@sfromlang}{\lbx@gost@sfromlang{origlanguage}} \newcommand*{\blx@gost@iflangundef}[3]{\iffieldundef{#1}{#2}{#3}} \newcommand*{\blx@gost@iflangsequal}[4]{\iffieldsequal{#1}{#2}{#3}{#4}} +} \newbibmacro*{begentry}{% \csundef{savedclearedcredits}% @@ -1955,6 +1977,33 @@ \setunit{\addcolondelim}% \printfield{booktitleaddon}} +\@ifpackagelater{biblatex}{2016/12/06} %biblatex 3.8+ +{\newbibmacro*{translation}{% + \ifnameundef{translator} + {\ifnameundef{booktranslator} + {\iflistundef{origlanguage} + {} + {\bibstring{bytranslator}% + \clearlist{origlanguage}}} + {}}% + {}} + +\newbibmacro*{book:translation}{% + \ifnameundef{booktranslator} + {\iflistundef{bookoriglanguage} + {} + {% temporarily redefining commands used in the bibstring + \savecommand\lbx@lfromlang% + \savecommand\lbx@sfromlang% + \renewcommand*{\lbx@lfromlang}{\lbx@gost@lfromlang{bookoriglanguage}}% + \renewcommand*{\lbx@sfromlang}{\lbx@gost@sfromlang{bookoriglanguage}}% + \bibstring{bytranslator}% + \restorecommand\lbx@lfromlang% + \restorecommand\lbx@sfromlang% + \clearlist{bookoriglanguage}}} + {}} +} +{ \newbibmacro*{translation}{% \ifnameundef{translator} {\ifnameundef{booktranslator} @@ -1979,6 +2028,10 @@ \restorecommand\lbx@sfromlang% \clearfield{bookoriglanguage}}} {}} +} + + + \renewbibmacro*{maintitle}{% \ifboolexpr{ diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx index c6aa28a4b38..e0488436487 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{greek-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{greek} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx index cdc0f0b9b81..b79deb76edf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{icelandic-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{icelandic} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx index 1dfaecd349c..64524b8707b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{italian-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{italian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx index d6728056e5f..b26b489139f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{portuguese-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{portuguese} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx index 7bef8722bfe..32e81c5087f 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} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{russian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx index 9b5c4c6be0e..9ae8b97949c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{slovene-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{slovene} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx index 42fe0d14bea..d2f078536c8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{spanish-gost.lbx} -[2017/06/27\space v1.15\space biblatex-gost styles] +[2017/08/23\space v1.16\space biblatex-gost styles] \InheritBibliographyExtras{spanish} |