diff options
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib')
52 files changed, 129 insertions, 73 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf Binary files differindex 189d2aeb18..10cd04525f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost-examples.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf Binary files differindex 432553593e..697bb5173d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex index ca4c266ca8..4735b9fd75 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/doc/biblatex-gost.tex @@ -2381,6 +2381,17 @@ gost-inline & false & true \\ \begin{itemize} +\item В отличие от \biblatex, в \biblatexgost поля \bibfield{volume}, + \bibfield{book}, \bibfield{part} и \bibfield{issue} могут содержать не только + числа, но и диапазоны. + Поскольку \biber не сортирует диапазоны, из них выделяется первое число, + которое копируется в специальные поля \bibfield{internalsortvolume}, + \bibfield{internalsortbook}, \bibfield{internalsortpart} и + \bibfield{internalsortissue}, по которым затем проводится сортировка. + Если поля \bibfield{volume},\textellipsis{} не начинаются с цифры, то они + копируются в \bibfield{internalsortvolume},\textellipsis{} как есть. + Если сортировка при этом некорректна, используйте поле \bibfield{sortvolume}. + \item \label{impl:4names} \biblatexgost автоматически отслеживает количество авторов, редакторов и переводчиков, изменяя формат вывода, когда это количество превышает 3 (см.~\secref{4names}). @@ -2577,9 +2588,14 @@ pageref & + & + & + & + & + & + & + & + \begin{changelog} + \begin{release}{1.24}{25-04-2023} + \item Добавлена сортировка для диапазонов полей \bibfield{volume}, + \bibfield{book}, \bibfield{part}, \bibfield{issue}.\see{sec:impldet} + \end{release} + \begin{release}{1.23}{14-04-2023} \item В документации ГОСТ 7.1---2003 заменён на ГОСТ Р 7.0.100-2018, а ГОСТ - 2.0.5---2008 на ГОСТ Р 2.0.5---2008. + 7.0.5---2008 на ГОСТ Р 7.0.5---2008. \item Уточнения в документации. \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx index 6d2728e9db..5ef307f612 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-alphabetic} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx index 12f68c4440..30579256a4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyvt} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx index 9cf0968224..214b85383a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-authoryear} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx index 1f55feed23..38127c850a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx index 04034742c8..a56f1f6f81 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline-min} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx index 810861be34..1b1aa48df6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-footnote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx index 4ab1f085a9..0cbe6b81ba 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx index c51d679e01..ab7132cfe0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-inline.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx index 2da84c9f3c..87db8350d9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-numeric} \AtEveryBibitem{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx index 608ed965b3..925393eac1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx index e51cc6b247..2817988fe9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/bbx/gost-standard.bbx @@ -1,8 +1,8 @@ \ProvidesFile{gost-standard.bbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] -\def\bbx@gost@date{2023/04/14} -\def\bbx@gost@version{1.23} +\def\bbx@gost@date{2023/04/25} +\def\bbx@gost@version{1.24} \@ifpackagelater{biblatex}{2019/09/01} {} @@ -183,6 +183,13 @@ final] \step[fieldset=options, fieldvalue={useeditor=false}] } + \map[overwrite, foreach={volume,book,part,issue}]{ + \step[fieldsource=\regexp{$MAPLOOP}, final] + \step[fieldset=\regexp{internalsort$MAPLOOP}, origfieldval] + \step[fieldsource=\regexp{internalsort$MAPLOOP}, + match=\regexp{(\d+).*}, + replace=\regexp{$1}] + } \map{ \step[typesource=candthesis,typetarget=thesis, final] \step[fieldset=type, fieldvalue=phdthesis] @@ -222,6 +229,13 @@ } {\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ + \map[overwrite, foreach={volume,book,part,issue}]{ + \step[fieldsource=\regexp{$MAPLOOP}, final] + \step[fieldset=\regexp{internalsort$MAPLOOP}, origfieldval] + \step[fieldsource=\regexp{internalsort$MAPLOOP}, + match=\regexp{(\d+).*}, + replace=\regexp{$1}] + } \map{ \step[typesource=candthesis,typetarget=thesis, final] \step[fieldset=type, fieldvalue=phdthesis] diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def index 7b8cc6c278..7a4ece1a90 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/biblatex-gost.def @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.def} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -84,6 +84,10 @@ books, parts, issues, + internalsortvolume, + internalsortbook, + internalsortpart, + internalsortissue, mediavideorecording, mediasoundrecording, mediagraphic, @@ -157,19 +161,19 @@ } \sort{ \field{sortvolume} - \field[padside=left,padwidth=4,padchar=0]{volume} + \field[padside=left,padwidth=4,padchar=0]{internalsortvolume} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{book} + \field[padside=left,padwidth=4,padchar=0]{internalsortbook} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{part} + \field[padside=left,padwidth=4,padchar=0]{internalsortpart} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{issue} + \field[padside=left,padwidth=4,padchar=0]{internalsortissue} \literal{0000} } } @@ -197,19 +201,19 @@ } \sort{ \field{sortvolume} - \field[padside=left,padwidth=4,padchar=0]{volume} + \field[padside=left,padwidth=4,padchar=0]{internalsortvolume} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{book} + \field[padside=left,padwidth=4,padchar=0]{internalsortbook} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{part} + \field[padside=left,padwidth=4,padchar=0]{internalsortpart} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{issue} + \field[padside=left,padwidth=4,padchar=0]{internalsortissue} \literal{0000} } \sort{ @@ -309,19 +313,19 @@ } \sort{ \field{sortvolume} - \field[padside=left,padwidth=4,padchar=0]{volume} + \field[padside=left,padwidth=4,padchar=0]{internalsortvolume} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{book} + \field[padside=left,padwidth=4,padchar=0]{internalsortbook} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{part} + \field[padside=left,padwidth=4,padchar=0]{internalsortpart} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{issue} + \field[padside=left,padwidth=4,padchar=0]{internalsortissue} \literal{0000} } } @@ -350,19 +354,19 @@ } \sort{ \field{sortvolume} - \field[padside=left,padwidth=4,padchar=0]{volume} + \field[padside=left,padwidth=4,padchar=0]{internalsortvolume} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{book} + \field[padside=left,padwidth=4,padchar=0]{internalsortbook} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{part} + \field[padside=left,padwidth=4,padchar=0]{internalsortpart} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{issue} + \field[padside=left,padwidth=4,padchar=0]{internalsortissue} \literal{0000} } \sort{ @@ -401,7 +405,20 @@ \field{title} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{volume} + \field{sortvolume} + \field[padside=left,padwidth=4,padchar=0]{internalsortvolume} + \literal{0000} + } + \sort{ + \field[padside=left,padwidth=4,padchar=0]{internalsortbook} + \literal{0000} + } + \sort{ + \field[padside=left,padwidth=4,padchar=0]{internalsortpart} + \literal{0000} + } + \sort{ + \field[padside=left,padwidth=4,padchar=0]{internalsortissue} \literal{0000} } } @@ -431,19 +448,20 @@ \field{year} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{volume} + \field{sortvolume} + \field[padside=left,padwidth=4,padchar=0]{internalsortvolume} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{book} + \field[padside=left,padwidth=4,padchar=0]{internalsortbook} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{part} + \field[padside=left,padwidth=4,padchar=0]{internalsortpart} \literal{0000} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{issue} + \field[padside=left,padwidth=4,padchar=0]{internalsortissue} \literal{0000} } \sort{ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx index c98276f0c4..6c44da4279 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{gost-alphabetic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx index 2ced6cf962..eed2f4ea23 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{alphabetic} \ExecuteBibliographyOptions{labelalpha,autocite=inline} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx index d18b14ca63..76b070ac5d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{gost-authoryear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx index f8cec460c4..fe17a452c8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, dropdates=false, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx index cb9da7bdf1..39b46370c1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{gost-footnote} \renewbibmacro*{cite:clearfields}{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx index e90a6a5c80..fbe79e9b60 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-footnote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{gost-inline} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx index db9e506f31..fcce2bef06 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{gost-inline} \renewbibmacro*{cite:clearfields}{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx index e9c722f304..0a6c25b7ce 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-inline.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx index 064086326c..705d70848f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{gost-numeric} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx index c3a9d88374..a19c1dc182 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/cbx/gost-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.cbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{dashed=false,citeisbn,citeurl,citedoi,citeeprint} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx index fa0e5ce402..1fb517d2ee 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/biblatex-gost.dbx @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] % Biblatex-GOST data model @@ -12,6 +12,10 @@ } \DeclareDatamodelFields[type=field, datatype=literal]{ + internalsortbook, + internalsortpart, + internalsortvolume, + internalsortissue, books,parts,issues, volsorder, sortvolume, @@ -66,6 +70,10 @@ number, book,part,issue, books,parts,issues, + internalsortbook, + internalsortpart, + internalsortvolume, + internalsortissue, language, media, credits, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx index 50733fe300..821a81f8ac 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx index d5b88f6aaf..90a53aa660 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-alphabetic.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx index 35c079c9e6..a0a6d54c88 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx index bb5142a709..359d86b434 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-authoryear.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx index f6d2d7567c..4553a46006 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx index 7fc20133ee..fc2ea50de6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-footnote.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx index 3ed2777154..5c3eeec21b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx index a35f43431b..9c98f5977d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-inline.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx index 0f2fad5d3e..1729e2eb62 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx index d09236ec32..27f285e881 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/dbx/gost-numeric.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.dbx} -[2023/04/14\space v1.23\space biblatex-gost data model] +[2023/04/25\space v1.24\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx index 2ebb92a8dd..61f47d5d5a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/american-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{american-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{american} \InheritBibliographyStrings{american} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx index 64e8cc7864..d31f0b6988 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/brazilian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{brazilian-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{brazilian} \InheritBibliographyStrings{brazilian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx index 76e56d6105..3612eabbcd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/british-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{british-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{british} \InheritBibliographyStrings{british} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx index d325510e5f..d2a912a55b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/catalan-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{catalan-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{catalan} \InheritBibliographyStrings{catalan} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx index 7560a6d555..08f84f55bd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/croatian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{croatian-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{croatian} \InheritBibliographyStrings{croatian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx index d1db57970f..6934f4a399 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/english-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{english-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{english} \InheritBibliographyStrings{english} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx index bc4247508d..d10f86b3fe 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/french-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{french-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{french} \InheritBibliographyStrings{french} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx index 1fc0ad5b3b..8a082634c2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/galician-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{galician-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{galician} \InheritBibliographyStrings{galician} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx index bb955d57e6..64b3b15be1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/german-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{german-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{german} \InheritBibliographyStrings{german} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx index 7545a00ecd..bd3bdeb7ca 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/greek-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{greek-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{greek} \InheritBibliographyStrings{greek} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx index 36dfbfab3a..10ddfdd2ce 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/icelandic-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{icelandic-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{icelandic} \InheritBibliographyStrings{icelandic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx index 028310678b..f3f3c1de43 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/italian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{italian-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{italian} \InheritBibliographyStrings{italian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx index 53588f645a..4a49907e81 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/portuguese-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{portuguese-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{portuguese} \InheritBibliographyStrings{portuguese} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx index da411e01c8..abfa4e443c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/russian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{russian-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{russian} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx index 459b618427..06ea607f9e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/slovene-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{slovene-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{slovene} \InheritBibliographyStrings{slovene} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx index e53f5fed89..473ebe0667 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gost/tex/lbx/spanish-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{spanish-gost.lbx} -[2023/04/14\space v1.23\space biblatex-gost styles] +[2023/04/25\space v1.24\space biblatex-gost styles] \InheritBibliographyExtras{spanish} \InheritBibliographyStrings{spanish} |