summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx9
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def2
-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.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx2
-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.bbx114
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx20
34 files changed, 118 insertions, 87 deletions
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 0a15f5a1c45..8ceb61ec0c8 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\space biblatex-gost data model]
% Biblatex-GOST data model
@@ -22,8 +22,9 @@
prioritynumber,
prioritycountry,
authorcountry,
- major,
- majorcode,
+ science,
+ specialitycode,
+ speciality,
heading,
}
@@ -89,7 +90,7 @@
}
\DeclareDatamodelEntryfields[thesis]{
- major,majorcode,
+ science,specialitycode,speciality,number,
}
\DeclareDatamodelEntryfields[online]{
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 f871d713334..648219308a7 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 80597a2e477..ba7a6b99b24 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 fa7aee8d04b..49bc17c37c6 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 242a1b42b11..f0d63a5d7cd 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 9895e123652..e80d21440b5 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 20d40b77df8..ac4373ab6eb 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 1846b4b77fc..411c1ddcae0 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 0f0c9044fb3..0a081b528a3 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 6181e17e9e4..463264ac2cb 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 41d351d38e6..7c93a13407c 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 d2760731495..8eeec4e0cd4 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 814e7816574..36c310174d6 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict,
dropdates=false,
diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx
index 4f23809f9ee..3677a8d981e 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 2a96bc37780..416b16c8a67 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 6cbc4ba5fff..6a3f93e8212 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 0d9845bffe6..62d5c1e858e 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 620230d7fe1..2e52b0e228d 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 5e511454fc0..d9d4f7378e6 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 e1ae9e4cf46..b55243a36da 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 eb090ffd572..0fb9247b800 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 618206d726d..4214b555821 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 242856f5505..74673d3e3e9 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 626b28462e0..ce4c58b5419 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 4e460934cd2..55e02d5c78e 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 89f2809f651..a76eb58116b 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 1b46a74e7e3..bc54e6eec82 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 a4129dfcad6..dd40f2d19f1 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 687ac712a7a..9c79f515fb9 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 c24d89d7257..cf0163a185e 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 841171cd564..cd3b0f6af07 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/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\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 ba23c608958..d7e7c36a6e5 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/01/28\space v1.11a\space biblatex-gost data model]
+[2017/02/05\space v1.12\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 7c566508219..7de3f64db2e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
@@ -1,8 +1,8 @@
\ProvidesFile{gost-standard.bbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
-\def\bbx@gost@date{2017/01/28}
-\def\bbx@gost@version{1.11a}
+\def\bbx@gost@date{2017/02/05}
+\def\bbx@gost@version{1.12}
\@ifpackagelater{biblatex}{2016/03/03}
{}
@@ -120,6 +120,12 @@
\DeclareBibliographyOption{movenames}[true]{%
\gdef\blx@opt@movenames{#1}}
+\newtoggle{bbx:gost:doublevols}
+\DeclareBibliographyOption{doublevols}[true]{%
+ \ifstrequal{#1}{true}
+ {\toggletrue{bbx:gost:doublevols}}
+ {\togglefalse{bbx:gost:doublevols}}}
+
\AtEndOfPackage{%
\ifdefstring{\blx@opt@movenames}{true}
{\DeclareStyleSourcemap{
@@ -184,9 +190,13 @@
}
\map{
\pertype{thesis}
- \step[fieldsource=speciality, fieldtarget=major]
- \step[fieldsource=specialitycode, fieldtarget=majorcode]
- \step[fieldsource=number, fieldtarget=majorcode]
+ \pertype{masterthesis}
+ \pertype{phdthesis}
+ \pertype{candthesis}
+ \pertype{docthesis}
+ \step[fieldsource=major, fieldtarget=speciality]
+ \step[fieldsource=majorcode, fieldtarget=specialitycode]
+ \step[fieldsource=number, fieldtarget=specialitycode]
}
}
}
@@ -219,9 +229,13 @@
}
\map{
\pertype{thesis}
- \step[fieldsource=speciality, fieldtarget=major]
- \step[fieldsource=specialitycode, fieldtarget=majorcode]
- \step[fieldsource=number, fieldtarget=majorcode]
+ \pertype{masterthesis}
+ \pertype{phdthesis}
+ \pertype{candthesis}
+ \pertype{docthesis}
+ \step[fieldsource=major, fieldtarget=speciality]
+ \step[fieldsource=majorcode, fieldtarget=specialitycode]
+ \step[fieldsource=number, fieldtarget=specialitycode]
}
}
}
@@ -240,7 +254,8 @@
related=true,
alldates=short,
eventdate=comp,
- blockpunct=emdash}
+ blockpunct=emdash,
+ doublevols=true}
\newbibmacro*{cbx:bookibid:check}[2]{#2}
@@ -255,30 +270,34 @@
\DeclareFieldFormat{journaltitle}{#1}
\DeclareFieldFormat{issuetitle}{#1}
\DeclareFieldFormat{maintitle}{#1}
-\DeclareFieldFormat*{volume}{%
- \iffieldnums{volume}
- {\ifbibstring{volume}
- {\bibstring{volume}\addabbrvspace#1}
+
+% volume etc
+%
+% helper for printing volume/book/number/part/issue
+\newcommand{\printvol}[2]{%
+ \ifnumcomp{\rangelen{#2}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
+ \iffieldnums{#2}
+ {\ifbibstring{#2}
+ {\bibstring{#2}\addabbrvspace#1}
{#1}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat*{volume}{\printvol{#1}{volume}}
\DeclareFieldFormat[article,periodical]{volume}{%
+ \ifnumcomp{\rangelen{volume}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
\ifbibstring{volume}
{\bibstring{jourvol}\addabbrvspace#1}
{#1}}
-\DeclareFieldFormat*{book}{%
- \iffieldnums{book}
- {\ifbibstring{book}
- {\bibstring{book}\addabbrvspace#1}
- {#1}}
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
-\DeclareFieldFormat*{part}{%
- \iffieldnums{part}
- {\ifbibstring{part}
- {\bibstring{part}\addabbrvspace#1}
- {#1}}
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat*{book}{\printvol{#1}{book}}
+\DeclareFieldFormat*{part}{\printvol{#1}{part}}
\DeclareFieldFormat{seriesnumber}{#1}%
\DeclareFieldFormat*{number}{%
+ \ifnumcomp{\rangelen{number}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
\iffieldnums{number}
{\ifbibstring{number}
{\bibsstring{number}\addabbrvspace#1}
@@ -289,6 +308,19 @@
\ifbibstring{number}
{\bibsstring{number}\addnbspace#1}
{#1}}%
+\DeclareFieldFormat{issue}{\printvol{#1}{issue}}
+\DeclareFieldFormat[article,periodical]{issue}{%
+ \ifnumcomp{\rangelen{issue}}{=}{2}
+ {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
+ {}%
+ \iffieldnums{issue}
+ {\ifbibstring{issue}%
+ {\bibstring{issue}\addabbrvspace#1}%
+ {\unspace\adddot#1}}%
+ {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+
+% volumes etc, involumes etc
+%
\newbibmacro*{volumes/parts/books/issues}[2]{%
\iffieldnum{#1}
{\ifbibstring{#1}
@@ -310,18 +342,9 @@
\DeclareFieldFormat{inbooks}{\usebibmacro{in+}{books}{#1}}
\DeclareFieldFormat{inparts}{\usebibmacro{in+}{parts}{#1}}
\DeclareFieldFormat{inissues}{\usebibmacro{in+}{issues}{#1}}
-\DeclareFieldFormat{issue}{%
- \iffieldnums{issue}
- {\ifbibstring{issue}
- {\bibstring{issue}\addabbrvspace#1}
- {#1}}
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
-\DeclareFieldFormat[article,periodical]{issue}{%
- \iffieldnums{issue}
- {\ifbibstring{issue}%
- {\bibstring{issue}\addabbrvspace#1}%
- {\unspace\adddot#1}}%
- {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+
+% dates
+%
\DeclareFieldFormat{date}{%
\iffieldundef{endyear}
{#1}
@@ -361,6 +384,11 @@
\iffieldnum{edition}
{\mkbibordedition{#1}\addnbspace\bibstring{edition}}
{\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat[thesis]{type}{%
+ \ifbibstring{#1}{\biblstring{#1}%
+ \setunit*{\addspace}%
+ \printfield{science}}%
+ {#1}}
\DeclareFieldFormat{prioritycountry}{%
\ifbibxstring{\thefield{prioritycountry}}
{\bibcpstring{\thefield{prioritycountry}}}
@@ -444,7 +472,9 @@
\renewcommand*{\bibpagespunct}{\addperiod\space}
\renewcommand*{\subtitlepunct}{\addcolon\space}
\newcommand*{\respdelim}{\addnbspace/\space}% delimiter before "credits"
-\newcommand*{\resppunct}{\addsemicolondelim}% punctuation between "credits" items
+\newcommand*{\resppunct}{\addsemicolondelim}% between "credits" items
+\newcommand*{\specialitydelim}{\addnbspace\textemdash\space}% between specialitycode and speciality
+\newcommand{\doublevolsdelim}{\slash}% between double volumes/numbers/...
% auxillary macros for volsorder handling
\newcounter{blx@gost@pointer}%
@@ -1988,8 +2018,10 @@
\setunit*{\addcolondelim}%
\printfield{type}%
\setunit*{\addcolondelim}%
- \printfield{majorcode}}%
- \setunit*{\addcolondelim}%
+ \printfield{specialitycode}%
+ \setunit*{\specialitydelim}%
+ \printfield{speciality}}%
+ \setunit{\addcolondelim}%
\printfield{titleaddon}%
\clearfield{media}}
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 18f9c5bc0ba..4f4469c7759 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx
@@ -1,20 +1,18 @@
\ProvidesFile{russian-gost.lbx}
-[2017/01/28\space v1.11a\space biblatex-gost styles]
+[2017/02/05\space v1.12\space biblatex-gost styles]
\InheritBibliographyExtras{russian}
\DeclareBibliographyStrings{%
inherit = {russian},%------------------------------------------------------------
- mathesis = {{дис\adddotspace\textellipsis\ маг. \printfield{major} наук}
- {дис\adddotspace\textellipsis\ маг. \printfield{major} наук}},
- phdthesis = {{дис\adddotspace\textellipsis\ канд. \printfield{major} наук}
- {дис\adddotspace\textellipsis\ канд. \printfield{major} наук}},
- docthesis = {{дис\adddotspace\textellipsis\ д-ра \printfield{major} наук}
- {дис\adddotspace\textellipsis\ д-ра \printfield{major} наук}},
- phdautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ канд. \printfield{major} наук}
- {автореф\adddotspace дис\adddotspace\textellipsis\ канд. \printfield{major} наук}},
- docautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ д-ра \printfield{major} наук}
- {автореф\adddotspace дис\adddotspace\textellipsis\ д-ра \printfield{major} наук}},
+ phdthesis = {{дис\adddotspace\textellipsis\ канд\adddot}
+ {дис\adddotspace\textellipsis\ канд\adddot}},
+ docthesis = {{дис\adddotspace\textellipsis\ д-ра}
+ {дис\adddotspace\textellipsis\ д-ра}},
+ phdautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ канд\adddot}
+ {автореф\adddotspace дис\adddotspace\textellipsis\ канд\adddot}},
+ docautoref = {{автореф\adddotspace дис\adddotspace\textellipsis\ д-ра}
+ {автореф\adddotspace дис\adddotspace\textellipsis\ д-ра}},
countryru = {{Российская Федерация}{Рос\adddotspace Федерация}},
countryussr = {{СССР}{СССР}},
patentru = {{патент Российской Федерации}{пат\adddotspace Рос\adddotspace Федерации}},