diff options
26 files changed, 51 insertions, 37 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 501f52c70b3..4e2ef54ee3b 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 0ec63025db9..71525bfd32a 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 5547c7a0701..dcfe20f92df 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex @@ -1,7 +1,7 @@ \input glyphtounicode.tex %these three lines are \input glyphtounicode-cmr.tex %needed for russian search/copy \pdfgentounicode=1 %(cmap) -\documentclass[10pt,a4paper,headings=small,numbers=enddot,english,russian]{ltxdockit}[2011/03/25] +\documentclass[10pt,a4paper,headings=small,numbers=enddot,english,russian]{ltxdockit} \usepackage[vscale=0.8,hdivide={0.2\paperwidth,*,0.1\paperwidth}]{geometry} \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} @@ -184,6 +184,8 @@ maintained. точки зрения совместимости с предыдущими версиями. Более полный список изменений см. в \Apxref{apx:changelog}. +\subsubsection*{Версия 1.2} + \subsubsection*{Версия 1.1} \begin{trivlist} @@ -200,11 +202,11 @@ maintained. в \biblatex, начиная с версии 2.8a (опция \opt{language}). \end{trivlist} -\subsubsection*{Версия 0.9.1} - -\begin{trivlist} -\item Переход на \biblatex~2.8 и \biber~1.8 -\end{trivlist} +% \subsubsection*{Версия 0.9.1} +% +% \begin{trivlist} +% \item Переход на \biblatex~2.8 и \biber~1.8 +% \end{trivlist} % \subsubsection*{Версия 0.9} % @@ -887,8 +889,8 @@ series = {|Языковеды мира / редкол.: Г.В. Степанов (как, например, в журналах) и со сквозной нумерацией. В первом случае, кроме прочего, не печатается год на месте выходных данных. В \biblatexgost только документы с нумерацией по годам соответствуют \bibtype{periodical}. Сериальные документы со -сквозной нумерацией следует оформлять как \bibtype{mvbook}, \bibtype{mvcollection}, -\bibtype{mvproceedings} или \bibtype{mvreference}. +сквозной нумерацией следует оформлять как \bibtype{book}, \bibtype{collection}, +\bibtype{proceedings} или \bibtype{reference}. Серия в журналах может пониматься в двух смыслах. Во-первых, она употребляется в том же смысле, что и для книг, и также выводится в области серии в виде: @@ -1158,7 +1160,7 @@ volsorder = {pbi}, \begin{multicols}{2} \begin{lstlisting}[style=bibtex,escapechar=|] -@MVCOLLECTION{mvcoll, +@COLLECTION{coll, title = {|Сказки|}, volumes = {5}, books = {6}, @@ -1167,7 +1169,7 @@ volsorder = {pbi}, } @COLLECTION{coll, - crossref = {mvcoll}, + crossref = {coll}, title = {|Сказки Центральной Африки|}, volume = {3}, book = {|книга первая|}, @@ -1616,6 +1618,13 @@ gost-authoryear-min & --- & false \\ регулируется в \biblatexgost (особенности реализации см. в~\apxref{impl:4names}). Впрочем, изменение этого количества означало бы отступление от ГОСТа. +Поскольку при перемещении имён в качестве заголовка выступает название текста, а не имена, +такие команды как \cmd{citeauthor} работают неверно. +Фактически, эти команды выводят список \bibfield{labelname} --- аналог заголовка в \biblatex, +который может состоять из авторов, редакторов или переводчиков, но который в данном случае +оказывается пустым. +Если вам нужно вывести отдельно одно из этих имён, воспользуйтесь командой \cmd{citename}. + Обратите внимание, что при перемещении имён записи вида \begin{lstlisting}[style=bibtex,escapechar=|] author = {|Петров, А.| and others} @@ -2060,6 +2069,11 @@ pageref & + & + & + & + & + & + & + & + & + & + & + & + & + & + & +\tabularnewli \begin{changelog} +\begin{release}{1.2}{01-05-2015} +\item Исправлена ошибка при выводе даты для записей типа \bibtype{article}. +\item Небольшое добавление в документации (в описании опции \texttt{movenames}). +\end{release} + \begin{release}{1.1}{28-11-2014} \item При \kvopt{movenames}{true} (установлено по умолчанию) `\texttt{and others}' в поле \bibfield{author/editor} 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 7b03cf5e232..c1469f40502 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 33e3297c432..39784e20933 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 ebcfc14bde9..f28165a2d56 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 315ed15c02f..41d009ee527 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 7cf2a6d096a..53d3a0d3b58 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 a9ddf442f69..bdb0f570d87 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 3718a1e6150..7ed0e1f11f6 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 3c7fd287e44..68fda704804 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 c0d53401d6b..c330ef8ab55 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 d016ab48a93..e725052abb9 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 c45da2e5fab..dfee7bc50db 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 f5bc291625a..84efe60a66b 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 e787e198c7b..6f85699ea38 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 db0a5e0542b..731ae72f064 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 ad25fa7926c..e751effff77 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 dddf211e6a3..2c6f320016c 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 367ec0764dc..a950022eb8a 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 9d6547f589c..e4c548ea281 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 b2114be7c7c..3ea1899bd88 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 c1d6dbc76ec..b1e2637f09c 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 c6d1187e382..bf37c18d3dd 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\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 1b7dc8c9fe4..77443222924 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\space biblatex-gost styles] -\def\bbx@gost@date{2014/11/28} -\def\bbx@gost@version{1.1} +\def\bbx@gost@date{2015/05/01} +\def\bbx@gost@version{1.2} \@ifpackagelater{biblatex}{2013/11/21} {} @@ -1702,7 +1702,7 @@ \newbibmacro*{jour:date}{% \usebibmacro{year}% \newunit\newblock - \mkbibdatelong{}{month}{day}% + \printtext{\mkbibdatelong{}{month}{day}}% \iffieldundef{endyear} {} {\bibdatedash% @@ -1710,7 +1710,7 @@ {\mbox{~~~~}} {\printfield{endyear}% \newunit\newblock - \mkbibdatelong{}{endmonth}{endday}}}% + \printtext{\mkbibdatelong{}{endmonth}{endday}}}}% } \newbibmacro*{jour:credits}{% 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 ebd6e2ec3d3..db314e6c48f 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} -[2014/11/28\space v1.1\space biblatex-gost styles] +[2015/05/01\space v1.2\space biblatex-gost styles] \InheritBibliographyExtras{russian} |