diff options
28 files changed, 68 insertions, 42 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib index 23740b0f970..987988f8215 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.bib @@ -6533,3 +6533,10 @@ series = {Межгосударственный стандарт}, langid = {russian}, } + +@ARTICLE{guriev2012russia, + title = {Россия — лидер по неравенству распределения богатства}, + author = {Гуриев, С. and Цывинский, О.}, + journaltitle = {Ведомости}, + date = {2012-06-06}, +} 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 4e2ef54ee3b..2b3e44189ae 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 71525bfd32a..a6583431653 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 dcfe20f92df..40c6c6b1101 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -177,14 +177,18 @@ maintained. %(текущие версии на CTAN). Пакет не будет работать с предыдущими версиями. -\subsection{Важные изменения в этой версии} +\subsection{Важные изменения в этой и некоторых недавних версиях} \label{sec:critchanges} Ниже перечислены изменения, на которые стоит обратить внимание с точки зрения совместимости с предыдущими версиями. Более полный список изменений см. в \Apxref{apx:changelog}. -\subsubsection*{Версия 1.2} +\subsubsection*{Версия 1.3} + +\begin{trivlist} +\item Критических изменений нет. +\end{trivlist} \subsubsection*{Версия 1.1} @@ -2055,8 +2059,8 @@ pagetotal & & & & & + & + & + & & + & + & & + & & + & \tabularnewline series+number & + & + & + & & + & + & + & & & & & & & & \tabularnewline \rl isbn/issn/isrn & + & + & + & + & + & + & + & + & & + & & + & + & + & \tabularnewline number & & & & & & & & & & & & + & & & \tabularnewline -doi+eprint+url+note & + & + & + & + & + & + & + & + & + & + & & + & & + & +\tabularnewline -url+urldate+note & & & & & & & & & & & + & & + & & \tabularnewline +doi+eprint+url+note & + & + & + & + & + & + & + & + & + & + & + & + & & + & +\tabularnewline +url+urldate+note & & & & & & & & & & & & & + & & \tabularnewline howpublished & & & & & & & & & + & & & & + & & +\tabularnewline addendum+pubstate & + & + & + & + & + & + & + & + & + & + & + & + & + & + & +\tabularnewline pageref & + & + & + & + & + & + & + & + & + & + & + & + & + & + & +\tabularnewline @@ -2069,6 +2073,12 @@ pageref & + & + & + & + & + & + & + & + & + & + & + & + & + & + & +\tabularnewli \begin{changelog} +\begin{release}{1.3}{02-05-2015} +\item Опять исправлена ошибка при выводе даты для записей типа \bibtype{article}. +\item Добавлен вывод полей \bibfield{doi} и \bibfield{eprint} в записи типа + \bibtype{online}. +\end{release} + \begin{release}{1.2}{01-05-2015} \item Исправлена ошибка при выводе даты для записей типа \bibtype{article}. \item Небольшое добавление в документации (в описании опции \texttt{movenames}). 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 c1469f40502..83454a37c84 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 39784e20933..e86831a8e9e 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 f28165a2d56..3b42c4defac 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 41d009ee527..60fa1dc5435 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 53d3a0d3b58..972464a69c7 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 bdb0f570d87..75f364832bc 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 7ed0e1f11f6..65f2afbf19d 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 68fda704804..58af8c347ed 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 c330ef8ab55..79caa47b0d3 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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-authoryear.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx index 3053e7d434b..e901d2d9068 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx @@ -1,6 +1,5 @@ % Biblatex-GOST data model \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} -%\input{biblatex-gost.dbx} \endinput
\ No newline at end of file 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 e725052abb9..8b180cee1a1 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 dfee7bc50db..3e6595ba3df 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 84efe60a66b..03044df5193 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 6f85699ea38..56104777ad8 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 731ae72f064..df4758bc863 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 e751effff77..a6328e2cd82 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 2c6f320016c..63f54da03d1 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 a950022eb8a..629cb4b2b97 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 e4c548ea281..42aeb548a35 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 3ea1899bd88..ab87097d1bb 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 b1e2637f09c..a4cafc02845 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 bf37c18d3dd..43c01924680 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\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 77443222924..17cfc3548fe 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\space biblatex-gost styles] -\def\bbx@gost@date{2015/05/01} -\def\bbx@gost@version{1.2} +\def\bbx@gost@date{2015/05/02} +\def\bbx@gost@version{1.3} \@ifpackagelater{biblatex}{2013/11/21} {} @@ -868,9 +868,7 @@ \newunit\newblock \printfield{systemreq}% \newunit\newblock - \usebibmacro{url+urldate}% - \setunit*{\addsemicolondelim}% - \printfield{note}% + \usebibmacro{doi+eprint+url+note}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock @@ -1702,7 +1700,9 @@ \newbibmacro*{jour:date}{% \usebibmacro{year}% \newunit\newblock - \printtext{\mkbibdatelong{}{month}{day}}% + \iffieldundef{month} + {} + {\printtext{\mkbibdatelong{}{month}{day}}}% \iffieldundef{endyear} {} {\bibdatedash% @@ -1710,7 +1710,9 @@ {\mbox{~~~~}} {\printfield{endyear}% \newunit\newblock - \printtext{\mkbibdatelong{}{endmonth}{endday}}}}% + \iffieldundef{endmonth} + {} + {\printtext{\mkbibdatelong{}{endmonth}{endday}}}}}% } \newbibmacro*{jour:credits}{% @@ -2041,13 +2043,21 @@ {#2}} \newbibmacro*{url+urldate+note}{% - \ifcitation - {\iftoggle{cbx:url} - {\usebibmacro{url+urldate}} - {}} - {\iftoggle{bbx:url} - {\usebibmacro{url+urldate}} - {}}% + \ifboolexpr{ + test {\ifentrytype{online}} + or + ( test \ifcitation + and + togl {cbx:url} + ) + or + ( not test \ifcitation + and + togl {bbx:url} + ) + } + {\usebibmacro{url+urldate}} + {}% \setunit*{\addsemicolondelim}% \printfield{note}} 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 db314e6c48f..2c46fd4b36d 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} -[2015/05/01\space v1.2\space biblatex-gost styles] +[2015/05/02\space v1.3\space biblatex-gost styles] \InheritBibliographyExtras{russian} |