summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-21 23:36:43 +0000
committerKarl Berry <karl@freefriends.org>2018-02-21 23:36:43 +0000
commitbbe3c3450d28b6f3bd3be9a99d41ee39c85fa7ec (patch)
treee29155332e3f26ef097d5f2034d9a542a15af8e2
parent0751111d87e02c33ba64bd34143fef372b644f1c (diff)
biblatex-gost (21feb18)
git-svn-id: svn://tug.org/texlive/trunk@46709 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdfbin808123 -> 808218 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdfbin260584 -> 260577 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex16
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx31
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx30
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx27
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx24
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx24
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx44
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx47
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx13
52 files changed, 324 insertions, 166 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
index d824aa86341..9e222cddf60 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
index a3b594515ca..e5925a7f75c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
index 912ba821a5c..861d2cc15bf 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gost/biblatex-gost.tex
@@ -1,4 +1,4 @@
-% -*- mode: LaTeX; coding: utf-8; fill-column: 90 -*-
+% -*- mode: LaTeX; coding: utf-8; fill-column: 80 -*-
\input glyphtounicode.tex %these three lines are
\input glyphtounicode-cmr.tex %needed for russian search/copy
\pdfgentounicode=1 %(cmap)
@@ -183,8 +183,10 @@ This package is maintained.
Для работы \biblatexgost версии \makeatletter\bbx@gost@version\makeatother\
требуются, как минимум,
-\biblatex~3.5\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.5/}
-и \biber~2.6\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.6/}.
+\biblatex~3.11%
+\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.11/}
+и \biber~2.11%
+\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.11/}.
%(текущие версии на CTAN).
Пакет может не работать с предыдущими версиями.
@@ -2476,6 +2478,13 @@ pageref & + & + & + & + & + & + & + & +
\begin{changelog}
+ \begin{release}{1.17}{20-02-2018}
+ \item Добавлен перевод поля \bibfield{media} (общее обозначение материала) на
+ английский, французский и немецкий языки.
+ \item Добавлены однобуквенные сокращения поля \bibfield{pagetotals} для
+ некоторых языков (см.~опцию \opt{otherlangs}).
+ \end{release}
+
\begin{release}{1.16}{23-08-2017}
\item \bibfield{origlanguage} и \bibfield{bookoriglanguage} теперь могут быть списками
(требуется \biblatex~3.8).
@@ -2491,6 +2500,7 @@ pageref & + & + & + & + & + & + & + & +
\end{release}
\begin{release}{1.14}{15-04-2017}
+ \item Исправлен вывод разделителя (тире) в списках \texttt{biblist}.
\item Добавлен везде, где можно, формат \texttt{titlecase} при выводе названий.
\item Исправлена библиография для ГОСТ 7.1-2003\see{sec:gostbibliography}
\item Страницы сокращаются до одной буквы, как требуется по \gostbibref{5.6.2.1, 7.4.1}.
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx
new file mode 100644
index 00000000000..a81e30e10e8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/american-gost.lbx
@@ -0,0 +1,31 @@
+\ProvidesFile{american-gost.lbx}
+[2018/02/20\space v1.17\space biblatex-gost styles]
+
+\InheritBibliographyExtras{american}
+\InheritBibliographyStrings{american}
+
+\DeclareBibliographyStrings{%
+ % inherit = {american},
+ mediavideorecording = {{Videorecording}{Videorecording}},
+ mediasoundrecording = {{Sound Recording}{Sound Recording}},
+ mediagraphic = {{Graphic}{Graphic}},
+ mediacartographic = {{Cartographic Material}{Cartographic Material}},
+ mediakit = {{Kit}{Kit}},
+ mediamotionpicture = {{Motion Picture}{Motion Picture}},
+ mediamicroform = {{Microform}{Microform}},
+ mediamultimedia = {{Multimedia}{Multimedia}},
+ mediamusic = {{Music}{Music}},
+ mediaobject = {{Object}{Object}},
+ mediamanuscript = {{Manuscript}{Manuscript}},
+ mediatext = {{Text}{Text}},
+ mediabraille = {{Braille}{Braille}},
+ mediaeresource = {{Electronic Resource}{Electronic Resource}},
+}
+
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{pages}{p\adddot}},
+ pagetotals = {{pages}{p\adddot}},
+ }}{}
+
+\endinput
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 8fc2b260cd4..3c1c59fa3f1 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\space biblatex-gost data model]
% Biblatex-GOST data model
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 29679331e43..5ab77153aa4 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
% these declarations should be here, not in lbx, to be initialized for all languages
\NewBibliographyString{
@@ -105,12 +105,31 @@
docthesis,phdautoref,docautoref,
}
+% \DeclareLanguageMappingSuffix{-gost} doesn't play
+% well with american/british/english
+%
+% \DeclareLanguageMappingSuffix{-gost}
+\DeclareLanguageMapping{american}{american-gost}
+\DeclareLanguageMapping{brazilian}{brazilian-gost}
+\DeclareLanguageMapping{british}{british-gost}
+\DeclareLanguageMapping{catalan}{catalan-gost}
+\DeclareLanguageMapping{croatian}{croatian-gost}
+\DeclareLanguageMapping{english}{english-gost}
+\DeclareLanguageMapping{french}{french-gost}
+\DeclareLanguageMapping{galician}{galician-gost}
+\DeclareLanguageMapping{german}{german-gost}
+\DeclareLanguageMapping{greek}{greek-gost}
+\DeclareLanguageMapping{icelandic}{icelandic-gost}
+\DeclareLanguageMapping{italian}{italian-gost}
+\DeclareLanguageMapping{portuguese}{portuguese-gost}
\DeclareLanguageMapping{russian}{russian-gost}
+\DeclareLanguageMapping{slovene}{slovene-gost}
+\DeclareLanguageMapping{spanish}{spanish-gost}
%
% Sorting Schemes
%
-\DeclareSortingScheme{nty}{
+\DeclareSortingTemplate{nty}{
\sort{
\field{presort}
}
@@ -155,7 +174,7 @@
}
}
-\DeclareSortingScheme{nyvt}{
+\DeclareSortingTemplate{nyvt}{
\sort{
\field{presort}
}
@@ -200,7 +219,7 @@
}
}
-\DeclareSortingScheme{ynt}{
+\DeclareSortingTemplate{ynt}{
\sort{
\field{presort}
}
@@ -231,7 +250,7 @@
}
}
-\DeclareSortingScheme{ydnt}{
+\DeclareSortingTemplate{ydnt}{
\sort{
\field{presort}
}
@@ -262,7 +281,7 @@
}
}
-\DeclareSortingScheme{nyt}{
+\DeclareSortingTemplate{nyt}{
\sort{
\field{presort}
}
@@ -307,7 +326,7 @@
}
}
-\DeclareSortingScheme{ntvy}{
+\DeclareSortingTemplate{ntvy}{
\sort{
\field{presort}
}
@@ -352,7 +371,7 @@
}
}
-\DeclareSortingScheme{anyt}{
+\DeclareSortingTemplate{anyt}{
\sort{
\field{presort}
}
@@ -387,7 +406,7 @@
}
}
-\DeclareSortingScheme{anyvt}{
+\DeclareSortingTemplate{anyvt}{
\sort{
\field{presort}
}
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 b05c290d05a..e4097613eed 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx
@@ -1,11 +1,13 @@
\ProvidesFile{brazilian-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{brazilian}
+\InheritBibliographyStrings{brazilian}
-\DeclareBibliographyStrings{%
- inherit = {brazilian},%------------------------------------------------------------
- pages = {{p\'aginas}{p\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{p\'aginas}{p\adddot}},
+ pagetotals = {{p\'aginas}{p\adddot}},
+ }}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx
new file mode 100644
index 00000000000..fe2f7855cba
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/british-gost.lbx
@@ -0,0 +1,30 @@
+\ProvidesFile{british-gost.lbx}
+[2018/02/20\space v1.17\space biblatex-gost styles]
+
+\InheritBibliographyExtras{british}
+\InheritBibliographyStrings{british}
+
+\DeclareBibliographyStrings{%
+ mediavideorecording = {{Videorecording}{Videorecording}},
+ mediasoundrecording = {{Sound Recording}{Sound Recording}},
+ mediagraphic = {{Graphic}{Graphic}},
+ mediacartographic = {{Cartographic Material}{Cartographic Material}},
+ mediakit = {{Kit}{Kit}},
+ mediamotionpicture = {{Motion Picture}{Motion Picture}},
+ mediamicroform = {{Microform}{Microform}},
+ mediamultimedia = {{Multimedia}{Multimedia}},
+ mediamusic = {{Music}{Music}},
+ mediaobject = {{Object}{Object}},
+ mediamanuscript = {{Manuscript}{Manuscript}},
+ mediatext = {{Text}{Text}},
+ mediabraille = {{Braille}{Braille}},
+ mediaeresource = {{Electronic Resource}{Electronic Resource}},
+}
+
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{pages}{p\adddot}},
+ pagetotals = {{pages}{p\adddot}},
+ }}{}
+
+\endinput
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 938971f5336..55f275849fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx
@@ -1,12 +1,13 @@
\ProvidesFile{catalan-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{catalan}
+\InheritBibliographyStrings{catalan}
-\DeclareBibliographyStrings{%
- inherit = {catalan},%------------------------------------------------------------
- page = {{p\`agina}{p\adddot}},
- pages = {{p\`agines}{p\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ page = {{p\`agina}{p\adddot}},
+ pages = {{p\`agines}{p\adddot}},
+ }}{}
\endinput
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 840be09863f..c23eba2ef49 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx
@@ -1,12 +1,13 @@
\ProvidesFile{croatian-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{croatian}
+\InheritBibliographyStrings{croatian}
-\DeclareBibliographyStrings{%
- inherit = {croatian},%------------------------------------------------------------
- page = {{stranica}{s\adddot}},
- pages = {{stranice}{s\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ page = {{stranica}{s\adddot}},
+ pages = {{stranice}{s\adddot}},
+ }}{}
\endinput
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 16159836183..4848f70449b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx
@@ -1,11 +1,30 @@
-\ProvidesFile{russian-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+\ProvidesFile{english-gost.lbx}
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{english}
+\InheritBibliographyStrings{english}
\DeclareBibliographyStrings{%
- inherit = {english},%------------------------------------------------------------
- pages = {{pages}{p\adddot}},
+ mediavideorecording = {{Videorecording}{Videorecording}},
+ mediasoundrecording = {{Sound Recording}{Sound Recording}},
+ mediagraphic = {{Graphic}{Graphic}},
+ mediacartographic = {{Cartographic Material}{Cartographic Material}},
+ mediakit = {{Kit}{Kit}},
+ mediamotionpicture = {{Motion Picture}{Motion Picture}},
+ mediamicroform = {{Microform}{Microform}},
+ mediamultimedia = {{Multimedia}{Multimedia}},
+ mediamusic = {{Music}{Music}},
+ mediaobject = {{Object}{Object}},
+ mediamanuscript = {{Manuscript}{Manuscript}},
+ mediatext = {{Text}{Text}},
+ mediabraille = {{Braille}{Braille}},
+ mediaeresource = {{Electronic Resource}{Electronic Resource}},
}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{pages}{p\adddot}},
+ pagetotals = {{pages}{p\adddot}},
+ }}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx
new file mode 100644
index 00000000000..a7d24784809
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/french-gost.lbx
@@ -0,0 +1,24 @@
+\ProvidesFile{french-gost.lbx}
+[2018/02/20\space v1.17\space biblatex-gost styles]
+
+\InheritBibliographyExtras{french}
+\InheritBibliographyStrings{french}
+
+\DeclareBibliographyStrings{%
+ mediavideorecording = {{enregistrement vidéo}{enregistrement vidéo}},
+ mediasoundrecording = {{enregistrement sonore}{enregistrement sonore}},
+ mediagraphic = {{image}{image}},
+ mediacartographic = {{matériel cartographique}{matériel cartographique}},
+ mediakit = {{kit}{kit}},
+ mediamotionpicture = {{film}{film}},
+ mediamicroform = {{microforme}{microforme}},
+ mediamultimedia = {{multimédia}{multimédia}},
+ mediamusic = {{musique}{musique}},
+ mediaobject = {{objet}{objet}},
+ mediamanuscript = {{manuscrit}{manuscrit}},
+ mediatext = {{texte}{texte}},
+ mediabraille = {{Braille}{Braille}},
+ mediaeresource = {{ressource électronique}{ressource électronique}},
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx
index fd6fd3584c6..35b127870dc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/galician-gost.lbx
@@ -1,11 +1,12 @@
\ProvidesFile{galician-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{galician}
+\InheritBibliographyStrings{galician}
-\DeclareBibliographyStrings{%
- inherit = {galician},%------------------------------------------------------------
- pages = {{p\'axinas}{p\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{p\'axinas}{p\adddot}},
+ }}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx
new file mode 100644
index 00000000000..f8803d8c094
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/german-gost.lbx
@@ -0,0 +1,24 @@
+\ProvidesFile{german-gost.lbx}
+[2018/02/20\space v1.17\space biblatex-gost styles]
+
+\InheritBibliographyExtras{german}
+\InheritBibliographyStrings{german}
+
+\DeclareBibliographyStrings{%
+ mediavideorecording = {{Videoaufzeichnung}{Videoaufzeichnung}},
+ mediasoundrecording = {{Audioaufzeichnung}{Audioaufzeichnung}},
+ mediagraphic = {{Bild}{Bild}},
+ mediacartographic = {{Kartenmaterial}{Kartenmaterial}},
+ mediakit = {{Kit}{Kit}}, % ??
+ mediamotionpicture = {{Film}{Film}},
+ mediamicroform = {{Mikroform}{Mikroform}},
+ mediamultimedia = {{Multimedia}{Multimedia}},
+ mediamusic = {{Musik}{Musik}},
+ mediaobject = {{Objekt}{Objekt}},
+ mediamanuscript = {{Manuskript}{Manuskript}},
+ mediatext = {{Text}{Text}},
+ mediabraille = {{Blindenschrift}{Blindenschrift }},
+ mediaeresource = {{elektronische Ressource}{elektronische Ressource}},
+}
+
+\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 0a3f3a83cd6..461e942bd08 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 cd0480ce1c6..0ced040d8ab 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 aa9c84af189..f04a5875aae 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 302ee6b2f04..0b5c508940e 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 3d92f52ed7a..682588a5550 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 12789a6d84c..40a75977f34 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 a22e59cf3d1..cb662f4a7a7 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 0ed0c81ffb2..32856572c34 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 1f1594722c3..08ccfbd0aa4 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 13481cc53ea..8b95eebd28a 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
@@ -22,12 +22,12 @@
{\ifuniquebaretitle{#2}{#1}}
{\ifsingletitle{#2}{#1}}}
-\providebibmacro*{labelyear+extrayear}{}
+\providebibmacro*{labelyear+extradate}{}
\providebibmacro*{authoryearlabel}{}
\newbibmacro*{cite:extras}{%
- \ifnameundef{labelname}% if there is labelname, extrayear disambiguation is enough
+ \ifnameundef{labelname}% if there is labelname, extradate disambiguation is enough
{\printfield{extratitleyear}} % if labeltitle+labelyear are the same
- {\printfield{extrayear}}}
+ {\printfield{extradate}}}
\providebibmacro*{labeltitle}{}
\newlength{\labelauthoryearsep}
@@ -42,7 +42,7 @@
\def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact}
\def\bbx@opt@mergedate@maximum{%
- \renewbibmacro*{labelyear+extrayear}{%
+ \renewbibmacro*{labelyear+extradate}{%
\blx@gost@ifneedsdate
{\iffieldundef{labelyear}
{}
@@ -71,7 +71,7 @@
}
\def\bbx@opt@mergedate@compact{%
- \renewbibmacro*{labelyear+extrayear}{%
+ \renewbibmacro*{labelyear+extradate}{%
\blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}%
%\renewcommand*{\labelnamepunct}{\newunitpunct}
\renewbibmacro*{date}{\blx@gost@ifneedsdate{}{\usebibmacro{printdate}{}}}%
@@ -88,25 +88,25 @@
}
\def\bbx@opt@mergedate@basic{%
- \renewbibmacro*{labelyear+extrayear}{%
+ \renewbibmacro*{labelyear+extradate}{%
\blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}%
%\renewcommand*{\labelnamepunct}{\newunitpunct}
\renewbibmacro*{date}{%
\blx@gost@ifneedsdate
- {\ifthenelse{\(\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}\)
+ {\ifthenelse{\(\iffieldundef{extradate}\AND\iffieldundef{extratitleyear}\)
\AND\iffieldundef{month}} %if date is simply year
{}
{\usebibmacro{printdate}{}}}
{\usebibmacro{printdate}{}}}%
\renewbibmacro*{year}{%
\blx@gost@ifneedsdate
- {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}}
+ {\ifthenelse{\iffieldundef{extradate}\AND\iffieldundef{extratitleyear}}
{}
{\usebibmacro{printyear}{}}}
{\usebibmacro{printyear}{}}}%
\renewbibmacro*{jour:date}{%
\blx@gost@ifneedsdate
- {\ifthenelse{\(\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}\)
+ {\ifthenelse{\(\iffieldundef{extradate}\AND\iffieldundef{extratitleyear}\)
\AND\iffieldundef{month}} %if date is simply year
{}
{\usebibmacro{year}%
@@ -121,24 +121,24 @@
}
\def\bbx@opt@mergedate@minimum{%
- \renewbibmacro*{labelyear+extrayear}{%
+ \renewbibmacro*{labelyear+extradate}{%
\blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}%
%\renewcommand*{\labelnamepunct}{\newunitpunct}
\renewbibmacro*{date}{%
\blx@gost@ifneedsdate
- {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}}
+ {\ifthenelse{\iffieldundef{extradate}\AND\iffieldundef{extratitleyear}}
{}
{\usebibmacro{printdate}{}}}
{\usebibmacro{printdate}{}}}%
\renewbibmacro*{year}{%
\blx@gost@ifneedsdate
- {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}}
+ {\ifthenelse{\iffieldundef{extradate}\AND\iffieldundef{extratitleyear}}
{}
{\usebibmacro{printyear}{}}}
{\usebibmacro{printyear}{}}}%
\renewbibmacro*{jour:date}{%
\blx@gost@ifneedsdate
- {\ifthenelse{\iffieldundef{extrayear}\AND\iffieldundef{extratitleyear}}
+ {\ifthenelse{\iffieldundef{extradate}\AND\iffieldundef{extratitleyear}}
{}
{\usebibmacro{year}%
\newunit\newblock
@@ -152,7 +152,7 @@
}
\def\bbx@opt@mergedate@false{%
- \renewbibmacro*{labelyear+extrayear}{%
+ \renewbibmacro*{labelyear+extradate}{%
\blx@gost@ifneedsdate{\usebibmacro{cite:labelyear+extras}{parens}}{}}%
%\renewcommand*{\labelnamepunct}{\newunitpunct}
\renewbibmacro*{date}{\usebibmacro{printdate}{}}%
@@ -163,11 +163,11 @@
}
\def\bbx@opt@mergedate@goststrict{%
- \renewbibmacro*{labelyear+extrayear}{}%
+ \renewbibmacro*{labelyear+extradate}{}%
\renewbibmacro*{date}{\usebibmacro{printdate}{}}%
\renewbibmacro*{year}{\usebibmacro{printyear}{}}%
\renewbibmacro*{labeltitle}{}%
- \DeclareFieldFormat{extrayear}{%
+ \DeclareFieldFormat{extradate}{%
\PackageWarning{biblatex-gost}{%
Citation \thefield{entrykey} is not unique}}%
\DeclareFieldFormat{extratitleyear}{%
@@ -179,7 +179,7 @@
}
\def\bbx@opt@mergedate@gostletter{%
- \renewbibmacro*{labelyear+extrayear}{}%
+ \renewbibmacro*{labelyear+extradate}{}%
\renewbibmacro*{date}{\usebibmacro{printdate}{}\usebibmacro{cite:extras}}%
\renewbibmacro*{year}{\usebibmacro{printyear}{}\usebibmacro{cite:extras}}%
\renewbibmacro*{labeltitle}{}%
@@ -188,7 +188,7 @@
}
\def\bbx@opt@mergedate@gostlabel{%
- \renewbibmacro*{labelyear+extrayear}{}%
+ \renewbibmacro*{labelyear+extradate}{}%
\renewbibmacro*{date}{\usebibmacro{printdate}{}}%
\renewbibmacro*{year}{\usebibmacro{printyear}{}}%
\renewbibmacro*{labeltitle}{}%
@@ -279,7 +279,7 @@
{\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
- \usebibmacro{labelyear+extrayear}}
+ \usebibmacro{labelyear+extradate}}
\renewbibmacro*{editor}{%
@@ -303,7 +303,7 @@
{\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
- \usebibmacro{labelyear+extrayear}}
+ \usebibmacro{labelyear+extradate}}
\renewbibmacro*{translator}{%
\usebibmacro{bbx:translator}{translatorstrg}}
@@ -326,7 +326,7 @@
{\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
- \usebibmacro{labelyear+extrayear}}
+ \usebibmacro{labelyear+extradate}}
\endinput
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 990dd25421c..120b0e932de 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict,
dropdates=false,
@@ -68,7 +68,7 @@
{\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
\(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
{\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
+ \usebibmacro{cite:extradate}}
{\setunit{\compcitedelim}%
\usebibmacro{cite:labelyear+extras}{bibhyperref}%
\savefield{labelyear}{\cbx@lastyear}}}
@@ -121,11 +121,11 @@
{\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
\(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
{\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
+ \usebibmacro{cite:extradate}}
{\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
+ \usebibmacro{cite:labelyear+extradate}%
\savefield{labelyear}{\cbx@lastyear}}}
- {\usebibmacro{cite:labelyear+extrayear}%
+ {\usebibmacro{cite:labelyear+extradate}%
\savefield{namehash}{\cbx@lasthash}%
\savefield{labelyear}{\cbx@lastyear}}}}}
{\usebibmacro{cite:shorthand}%
@@ -138,9 +138,9 @@
{\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
\(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
{\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
+ \usebibmacro{cite:extradate}}
{\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
+ \usebibmacro{cite:labelyear+extradate}%
\savefield{labelyear}{\cbx@lastyear}}}
{\setunit{\compcitedelim}%
\usebibmacro{cite:shorthand}%
@@ -156,7 +156,7 @@
{}%
\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
- {\usebibmacro{cite:labelyear+extrayear}}}
+ {\usebibmacro{cite:labelyear+extradate}}}
{\usebibmacro{cite:shorthand}}}
{\printnames{labelname}%
\setunit{%
@@ -170,7 +170,7 @@
{\usebibmacro{cite:label}}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
- {\usebibmacro{cite:labelyear+extrayear}}}%
+ {\usebibmacro{cite:labelyear+extradate}}}%
\savefield{labelyear}{\cbx@lastyear}}
{\usebibmacro{cite:shorthand}%
\global\undef\cbx@lastyear}}%
@@ -193,17 +193,17 @@
{\printtext[bibhyperref]{\printtext[citetitle]{\printfield[titlecase]{labeltitle}}}}
{\printtext[bibhyperref]{\printfield{label}}}}
-\newbibmacro*{cite:labelyear+extrayear}{%
+\newbibmacro*{cite:labelyear+extradate}{%
\iffieldundef{labelyear}
{}
{\printtext[bibhyperref]{%
\usebibmacro{printyear}{label}%
- \printfield{extrayear}}}}
+ \printfield{extradate}}}}
-\newbibmacro*{cite:extrayear}{%
- \iffieldundef{extrayear}
+\newbibmacro*{cite:extradate}{%
+ \iffieldundef{extradate}
{}
- {\printtext[bibhyperref]{\printfield{extrayear}}}}
+ {\printtext[bibhyperref]{\printfield{extradate}}}}
\newbibmacro*{cite:ibid}{%
\printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
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 5040f1f7b11..f294f79fe97 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 fd3766a9c02..803c33c3978 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 289f01b4774..7178cf5dabf 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 20757b88d5c..4ee9fbe3d04 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 aba5220ba0e..7d6e5e2bba9 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 6748a1999c2..d0f65d35403 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 e1115d700e1..c6863ffab10 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 3d44b3908ec..b43cfdd835f 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 ae23b44105a..e9afa059ce6 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 0293a186e37..677788ed5dc 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 19a6bf67caa..a3832f1f044 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 86ce8e4bf9c..9cda2b37a06 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 e8e421012a0..9770eafa670 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 7e3df34c1fd..cfaae36c035 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 09a2e459e90..40a6c594d27 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 936b72ba37d..b78d0974db3 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 0afbef682d9..17a8a6cea4b 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 c697422d6aa..9c2645cca97 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 c63237de594..3e0690e317a 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/08/23\space v1.16\space biblatex-gost data model]
+[2018/02/20\space v1.17\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 8962185e25e..4e0ecfd47a7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
@@ -1,14 +1,14 @@
\ProvidesFile{gost-standard.bbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
-\def\bbx@gost@date{2017/08/23}
-\def\bbx@gost@version{1.16}
+\def\bbx@gost@date{2018/02/20}
+\def\bbx@gost@version{1.17}
-\@ifpackagelater{biblatex}{2016/09/07}
+\@ifpackagelater{biblatex}{2016/12/06}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {This version of 'biblatex-gost' requires biblatex v3.5 or
+ {This version of 'biblatex-gost' requires biblatex v3.8 or
later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
@@ -41,6 +41,7 @@
\newtoggle{cbx:eprint}
\newtoggle{bbx:related:bib}
\newtoggle{bbx:related:cite}
+\newtoggle{bbx:gost:otherlangs}
\newtoggle{bbx:gostbibliography}
\togglefalse{bbx:gostbibliography}
@@ -48,28 +49,8 @@
\DeclareBibliographyOption{otherlangs}[true]{%
\ifstrequal{#1}{true}
- {\DeclareLanguageMapping{brazilian}{brazilian-gost}
- \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}
- \DeclareLanguageMapping{portuguese}{portuguese-gost}
- \DeclareLanguageMapping{slovene}{slovene-gost}
- \DeclareLanguageMapping{spanish}{spanish-gost}}
- {\DeclareLanguageMapping{brazilian}{brazilian}
- \DeclareLanguageMapping{catalan}{catalan}
- \DeclareLanguageMapping{croatian}{croatian}
- \DeclareLanguageMapping{english}{english}
- \DeclareLanguageMapping{galician}{galician}
- \DeclareLanguageMapping{greek}{greek}
- \DeclareLanguageMapping{icelandic}{icelandic}
- \DeclareLanguageMapping{italian}{italian}
- \DeclareLanguageMapping{portuguese}{portuguese}
- \DeclareLanguageMapping{slovene}{slovene}
- \DeclareLanguageMapping{spanish}{spanish}}
+ {\toggletrue{bbx:gost:otherlangs}}
+ {\togglefalse{bbx:gost:otherlangs}}
}
\newbibmacro*{bbx:savehash}{%
@@ -282,7 +263,8 @@
eventdate=comp,
blockpunct=emdash,
doublevols=true,
- otherlangs=true}
+ otherlangs=true,
+}
\newbibmacro*{cbx:bookibid:check}[2]{#2}
@@ -545,6 +527,13 @@
\newcommand*{\blx@gost@iflangsequal}[4]{\iffieldsequal{#1}{#2}{#3}{#4}}
}
+% clear \newblock in citations, not in biblists
+\AtUsedriver*{%
+ \ifcitation{\let\newblock\relax}{}%
+ \let\finentry\blx@finentry@usedrv
+ \let\abx@macro@bibindex\@empty
+ \let\abx@macro@pageref\@empty}
+
\newbibmacro*{begentry}{%
\csundef{savedclearedcredits}%
\csundef{savedclearededitor}%
@@ -2379,7 +2368,7 @@
{\datecircaprint}%
\dateeraprintpre{#1year}%
\mkyearzeros{\thefield{#1year}}%
- % \printfield{extrayear}%
+ % \printfield{extradate}%
\iffieldsequal{#1dateera}{#1enddateera}
{}
{\dateeraprint{#1year}}%
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 e0488436487..a6697995c61 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx
@@ -1,11 +1,12 @@
\ProvidesFile{greek-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{greek}
+\InheritBibliographyStrings{greek}
-\DeclareBibliographyStrings{%
- inherit = {greek},%------------------------------------------------------------
- pages = {{σελίδες}{σ\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{σελίδες}{σ\adddot}},
+ }}{}
\endinput
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 b79deb76edf..224c3e8b44a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx
@@ -1,12 +1,13 @@
\ProvidesFile{icelandic-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{icelandic}
+\InheritBibliographyStrings{icelandic}
-\DeclareBibliographyStrings{%
- inherit = {icelandic},%------------------------------------------------------------
- page = {{bla\dh{}s\'{\i}\dh{}a}{b\adddot}},
- pages = {{bla\dh{}s\'{\i}\dh{}ur}{b\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ page = {{bla\dh{}s\'{\i}\dh{}a}{b\adddot}},
+ pages = {{bla\dh{}s\'{\i}\dh{}ur}{b\adddot}},
+ }}{}
\endinput
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 64524b8707b..9222cf6519d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx
@@ -1,11 +1,12 @@
\ProvidesFile{italian-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{italian}
+\InheritBibliographyStrings{italian}
-\DeclareBibliographyStrings{%
- inherit = {italian},%------------------------------------------------------------
- pages = {{pagine}{p\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{pagine}{p\adddot}},
+ }}{}
\endinput
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 b26b489139f..09fed08c3cb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx
@@ -1,11 +1,13 @@
\ProvidesFile{portuguese-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{portuguese}
+\InheritBibliographyStrings{portuguese}
-\DeclareBibliographyStrings{%
- inherit = {portuguese},%------------------------------------------------------------
- pages = {{p\'aginas}{p\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ pages = {{p\'aginas}{p\adddot}},
+ pagetotals = {{p\'aginas}{p\adddot}},
+ }}{}
\endinput
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 32e81c5087f..1c5c327bc39 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/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\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 9ae8b97949c..a58ef046f71 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx
@@ -1,12 +1,13 @@
\ProvidesFile{slovene-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{slovene}
+\InheritBibliographyStrings{slovene}
-\DeclareBibliographyStrings{%
- inherit = {slovene},%------------------------------------------------------------
- page = {{stran}{s\adddot}},
- pages = {{strani}{s\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ page = {{stran}{s\adddot}},
+ pages = {{strani}{s\adddot}},
+ }}{}
\endinput
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 d2f078536c8..4303796fe57 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx
@@ -1,12 +1,13 @@
\ProvidesFile{spanish-gost.lbx}
-[2017/08/23\space v1.16\space biblatex-gost styles]
+[2018/02/20\space v1.17\space biblatex-gost styles]
\InheritBibliographyExtras{spanish}
+\InheritBibliographyStrings{spanish}
-\DeclareBibliographyStrings{%
- inherit = {spanish},%------------------------------------------------------------
- page = {{p\'agina}{p\adddot}},
- pages = {{p\'aginas}{p\adddot}},
-}
+\iftoggle{bbx:gost:otherlangs}
+ {\DeclareBibliographyStrings{%
+ page = {{p\'agina}{p\adddot}},
+ pages = {{p\'aginas}{p\adddot}},
+ }}{}
\endinput