summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-16 23:13:28 +0000
committerKarl Berry <karl@freefriends.org>2017-01-16 23:13:28 +0000
commitc4924cb3f7ffb2985272e1c2441d67a116f37373 (patch)
tree9102231383106b601e8f39a1731db3886042b51e /Master/texmf-dist/bibtex
parentabf16904fa655d4b73614dacb33af43ba0420a45 (diff)
gost (14jan17)
git-svn-id: svn://tug.org/texlive/trunk@42974 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2003.bst190
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2003s.bst190
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008.bst199
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008l.bst199
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst199
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008n.bst199
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst199
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008s.bst199
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost780.bst178
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost780s.bst178
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2003.bst176
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst176
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008.bst185
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst185
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst185
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst185
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst185
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst185
18 files changed, 2428 insertions, 964 deletions
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2003.bst b/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
index 12279407f0b..ff477b544c5 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
-
%%
%% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
ENTRY
{ address
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -653,8 +656,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -712,13 +728,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -749,9 +781,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -933,7 +968,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -963,6 +998,29 @@ FUNCTION {format.date}
if$
}
+FUNCTION {address.or.location}
+{
+ address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
FUNCTION {output.address.publisher}
{
address empty$
@@ -1258,15 +1316,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1409,10 +1468,8 @@ FUNCTION {add.media}
{ duplicate$ empty$
'skip$
{ media empty$
+ { " " * bbl.media.text enclose.square.brackets * }
{ " " * bbl.media enclose.square.brackets * }
- { " " * media enclose.square.brackets * }
-%% { bbl.media enclose.square.brackets * }
-%% { media enclose.square.brackets * }
if$
}
if$
@@ -1553,7 +1610,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1716,7 +1773,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1812,13 +1869,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1843,13 +1905,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1871,11 +1934,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1889,19 +1956,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1915,19 +1986,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1954,13 +2029,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst b/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
index f295347dc75..e89eaf2280b 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
-
%%
%% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
ENTRY
{ address
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -663,8 +666,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -722,13 +738,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -759,9 +791,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -943,7 +978,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -973,6 +1008,29 @@ FUNCTION {format.date}
if$
}
+FUNCTION {address.or.location}
+{
+ address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
FUNCTION {output.address.publisher}
{
address empty$
@@ -1268,15 +1326,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1419,10 +1478,8 @@ FUNCTION {add.media}
{ duplicate$ empty$
'skip$
{ media empty$
+ { " " * bbl.media.text enclose.square.brackets * }
{ " " * bbl.media enclose.square.brackets * }
- { " " * media enclose.square.brackets * }
-%% { bbl.media enclose.square.brackets * }
-%% { media enclose.square.brackets * }
if$
}
if$
@@ -1563,7 +1620,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1726,7 +1783,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1822,13 +1879,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1853,13 +1915,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1881,11 +1944,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1899,19 +1966,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1925,19 +1996,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1964,13 +2039,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
index f1decdf0f90..4b069dd1ee9 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -653,8 +656,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -712,13 +728,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -749,9 +781,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -963,7 +998,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -993,11 +1028,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1279,15 +1337,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1429,7 +1488,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1566,7 +1634,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1729,7 +1797,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1825,13 +1893,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1856,13 +1929,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1884,11 +1958,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1902,19 +1980,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1928,19 +2010,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1967,13 +2053,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
index 8684ccf8aa8..df29d18687e 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -653,8 +656,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -712,13 +728,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -749,9 +781,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -963,7 +998,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -993,11 +1028,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1279,15 +1337,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1417,7 +1476,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1554,7 +1622,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1717,7 +1785,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1813,13 +1881,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1844,13 +1917,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1872,11 +1946,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1890,19 +1968,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1916,19 +1998,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1955,13 +2041,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
index 473d127028a..952e2c2c78f 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -663,8 +666,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -722,13 +738,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -759,9 +791,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -973,7 +1008,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -1003,11 +1038,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1289,15 +1347,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1427,7 +1486,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1564,7 +1632,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1727,7 +1795,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1823,13 +1891,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1854,13 +1927,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1882,11 +1956,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1900,19 +1978,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1926,19 +2008,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1965,13 +2051,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
index 3c14f6db697..a58695ba507 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -703,8 +706,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -713,19 +716,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -762,13 +778,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -799,9 +831,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -1132,7 +1167,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -1163,11 +1198,34 @@ FUNCTION {format.date}
extra.label * % new in v.1.2
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1542,15 +1600,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1692,7 +1751,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1832,7 +1900,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -2000,7 +2068,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -2101,13 +2169,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2133,13 +2206,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -2162,11 +2236,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2180,20 +2258,24 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2207,20 +2289,24 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2248,13 +2334,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
index 977261531db..ab98c1f6606 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -703,8 +706,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -713,19 +716,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -762,13 +778,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -799,9 +831,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -1132,7 +1167,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -1163,11 +1198,34 @@ FUNCTION {format.date}
extra.label * % new in v.1.2
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1542,15 +1600,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1692,7 +1751,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1832,7 +1900,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -2000,7 +2068,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -2101,13 +2169,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2133,13 +2206,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -2162,11 +2236,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2180,20 +2258,24 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2207,20 +2289,24 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2248,13 +2334,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
index 115852de817..5f659547847 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -663,8 +666,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -722,13 +738,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -759,9 +791,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -973,7 +1008,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -1003,11 +1038,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1289,15 +1347,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1439,7 +1498,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1576,7 +1644,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1739,7 +1807,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1835,13 +1903,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1866,13 +1939,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1894,11 +1968,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1912,19 +1990,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1938,19 +2020,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1977,13 +2063,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost780.bst b/Master/texmf-dist/bibtex/bst/gost/gost780.bst
index 81af4e14be4..7fd695a88a2 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost780.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost780.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
-
%%
%% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
ENTRY
{ address
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -653,8 +656,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -712,13 +728,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -749,9 +781,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -933,7 +968,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -963,11 +998,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1254,15 +1312,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1392,7 +1451,16 @@ FUNCTION {format.isbn}
FUNCTION {add.doi} { }
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
FUNCTION {output.eprint.url}
@@ -1502,7 +1570,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1663,7 +1731,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1761,7 +1829,8 @@ FUNCTION {thesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1784,13 +1853,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1812,7 +1882,8 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1824,15 +1895,16 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1844,15 +1916,16 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1877,13 +1950,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost780s.bst b/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
index 25c257e475a..00b3526f45e 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
-
%%
%% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
ENTRY
{ address
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -663,8 +666,8 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
- "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+ "\cyrn\cyra\cyru\cyrk}" * }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
- "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+ "\cyrn\cyra\cyru\cyrk}" * }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type "t" change.case$ }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -722,13 +738,29 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
- { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
{ curlanguage "ukrainian" =
- { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+ { curlanguage "ukrainian" =
+ { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+ "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
{ "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
@@ -759,9 +791,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -943,7 +978,7 @@ FUNCTION {format.month}
{ month "Aug." =
{ "\CYRA\cyrv\cyrg\." }
{ month "Sep." =
- { "\CYRS\cyre\cyn\cyrt." }
+ { "\CYRS\cyre\cyrn\cyrt." }
{ month "Oct." =
{ "\CYRO\cyrk\cyrt." }
{ month "Nov." =
@@ -973,11 +1008,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1264,15 +1322,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type "t" change.case$
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1402,7 +1461,16 @@ FUNCTION {format.isbn}
FUNCTION {add.doi} { }
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
FUNCTION {output.eprint.url}
@@ -1512,7 +1580,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1673,7 +1741,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1771,7 +1839,8 @@ FUNCTION {thesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1794,13 +1863,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1822,7 +1892,8 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1834,15 +1905,16 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1854,15 +1926,16 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.slash
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher.date
new.block
@@ -1887,13 +1960,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
index b48b16f9cff..7e070613b9c 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
-
%%
%% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
ENTRY
{ address
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -651,7 +654,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -660,18 +663,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -708,7 +724,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -720,6 +736,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -745,9 +773,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -958,6 +989,29 @@ FUNCTION {format.date}
if$
}
+FUNCTION {address.or.location}
+{
+ address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
FUNCTION {output.address.publisher}
{
address empty$
@@ -1253,15 +1307,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1404,10 +1459,8 @@ FUNCTION {add.media}
{ duplicate$ empty$
'skip$
{ media empty$
+ { " " * bbl.media.text enclose.square.brackets * }
{ " " * bbl.media enclose.square.brackets * }
- { " " * media enclose.square.brackets * }
-%% { bbl.media enclose.square.brackets * }
-%% { media enclose.square.brackets * }
if$
}
if$
@@ -1548,7 +1601,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1711,7 +1764,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1807,13 +1860,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1838,13 +1896,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1866,11 +1925,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1884,19 +1947,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1910,19 +1977,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1949,13 +2020,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
index 1276ff44d4c..c9d7cd74a71 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
-
%%
%% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
ENTRY
{ address
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -661,7 +664,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -670,18 +673,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -718,7 +734,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -730,6 +746,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -755,9 +783,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -968,6 +999,29 @@ FUNCTION {format.date}
if$
}
+FUNCTION {address.or.location}
+{
+ address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
FUNCTION {output.address.publisher}
{
address empty$
@@ -1263,15 +1317,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1414,10 +1469,8 @@ FUNCTION {add.media}
{ duplicate$ empty$
'skip$
{ media empty$
+ { " " * bbl.media.text enclose.square.brackets * }
{ " " * bbl.media enclose.square.brackets * }
- { " " * media enclose.square.brackets * }
-%% { bbl.media enclose.square.brackets * }
-%% { media enclose.square.brackets * }
if$
}
if$
@@ -1558,7 +1611,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1721,7 +1774,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1817,13 +1870,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1848,13 +1906,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1876,11 +1935,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1894,19 +1957,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1920,19 +1987,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1959,13 +2030,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
index 13f1c7877d9..6b37bab8ee4 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -651,7 +654,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -660,18 +663,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -708,7 +724,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -720,6 +736,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -745,9 +773,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -988,11 +1019,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1274,15 +1328,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1424,7 +1479,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1561,7 +1625,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1724,7 +1788,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1820,13 +1884,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1851,13 +1920,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1879,11 +1949,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1897,19 +1971,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1923,19 +2001,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1962,13 +2044,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
index 30f6173791e..33c38ca1c03 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -651,7 +654,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -660,18 +663,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -708,7 +724,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -720,6 +736,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -745,9 +773,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -988,11 +1019,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1274,15 +1328,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1412,7 +1467,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1549,7 +1613,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1712,7 +1776,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1808,13 +1872,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1839,13 +1908,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1867,11 +1937,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1885,19 +1959,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1911,19 +1989,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1950,13 +2032,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
index 3e17dae7d62..73136bbe492 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -661,7 +664,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -670,18 +673,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -718,7 +734,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -730,6 +746,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -755,9 +783,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -998,11 +1029,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1284,15 +1338,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1434,7 +1489,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1571,7 +1635,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1734,7 +1798,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1830,13 +1894,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1861,13 +1930,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1889,11 +1959,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1907,19 +1981,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1933,19 +2011,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1972,13 +2054,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
index b554c8e0a8a..296c8d812ac 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -701,7 +704,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -710,18 +713,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -758,7 +774,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -770,6 +786,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -795,9 +823,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -1158,11 +1189,34 @@ FUNCTION {format.date}
extra.label * % new in v.1.2
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1537,15 +1591,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1687,7 +1742,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1827,7 +1891,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1995,7 +2059,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -2096,13 +2160,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2128,13 +2197,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -2157,11 +2227,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2175,20 +2249,24 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2202,20 +2280,24 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2243,13 +2325,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
index 7c725e1635f..a0fd79862f6 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -701,7 +704,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -710,18 +713,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -758,7 +774,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -770,6 +786,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -795,9 +823,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -1158,11 +1189,34 @@ FUNCTION {format.date}
extra.label * % new in v.1.2
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1537,15 +1591,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1687,7 +1742,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1827,7 +1891,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1995,7 +2059,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -2096,13 +2160,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2128,13 +2197,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -2157,11 +2227,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2175,20 +2249,24 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2202,20 +2280,24 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -2243,13 +2325,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
index 27359bce4bf..33ccfa26718 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
-
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
institution
journal
key
+ %major % new in v.1.2i, alias for speciality, not implemented
+ majorcode % new in v.1.2i, alias for specialitycode
month
note
number
organization
pages
- eid % new in v1.2c
+ eid % new in v1.2c
publisher
- school
+ school % alias for institution
series
+ %speciality % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+ specialitycode % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
title
- %medium % new in v1.2; renamed to media.
- media % new in v1.2f
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
language
- langid % new in v1.2c
+ langid % new in v1.2c
booklanguage
- date % new in v1.2f; not implemented yet...
+ %date % not implemented yet...
pagetotal
url
urldate
isbn
doi
- eprinttype % = archivePrefix
- eprintclass % = primaryClass
+ eprinttype % = archivePrefix
+ eprintclass % = primaryClass
eprint
% new in v1.2f:
% appear in biblatex:
- addendum
- holder
- location
- subtitle
- titleaddon
- version
- % Appear in biblatex-gost:
- authorcountry % ??
+ %addendum % not implemented yet...
+ holder % see patent
+ location % new in v.1.2i, alias of address
+ %subtitle % not implemented yet...
+ titleaddon % new in v.1.2i, see @thesis
+ %version % not implemented yet...
+ % Appear in biblatex-gost for @patent entry:
+ authorcountry % country of the patent authors
credits % statement of responsibility, other than provided in Biblatex
ipc % Code of the International Patent Classification
%media % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
if$}
if$}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
{ curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "german" =
@@ -661,7 +664,7 @@ FUNCTION {bbl.phdthesis}
{ curlanguage "german" =
{ "Diss.~Ph.\,D." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ кандидата наук}" }
+ { "{дис.\ \ldots\ канд. наук}" }
{ curlanguage "french" =
{ "Th\`{e}se de doctorat" }
{ "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -670,18 +673,31 @@ FUNCTION {bbl.phdthesis}
if$}
if$}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
{ curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
{ curlanguage "german" =
{ "Diss.~Dr." }
{ curlanguage "russian" =
- { "{Дисс\ldots\ доктора наук}" }
- { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+ { "{дис.\ \ldots\ д-ра наук}" }
+ { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
if$}
if$}
if$}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+ { bbl.mathesis }
+ { type "phdthesis" =
+ { bbl.phdthesis }
+ { type "docthesis" =
+ { bbl.docthesis }
+ %%{ "!!!" type * "t" change.case$ }
+ { type }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.nnoaddress}
{ curlanguage "english" =
{ "S.\ l." }
@@ -718,7 +734,7 @@ FUNCTION {bbl.media.text}
if$}
if$}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -730,6 +746,18 @@ FUNCTION {bbl.media.elres}
if$}
if$}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+ { "Electronic resource online" }
+ { curlanguage "russian" =
+ { "{Электронный ресурс онлайн}" }
+ { curlanguage "ukrainian" =
+ { "{Електронний ресурс онлайн}" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+ if$}
+ if$}
+if$}
+
FUNCTION {bbl.chief}
{ curlanguage "english" =
{ "chief" }
@@ -755,9 +783,12 @@ FUNCTION {bbl.executor}
if$}
FUNCTION {bbl.media}
-{ type$ "online" =
- { bbl.media.elres }
- { bbl.media.text }
+{ media "online" =
+ { bbl.media.online }
+ { media "eresource" =
+ { bbl.media.eresource }
+ { bbl.media.text }
+ if$}
if$}
FUNCTION {bbl.req}
@@ -998,11 +1029,34 @@ FUNCTION {format.date}
if$
}
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
{
address empty$
+ { location }
+ { address }
+ if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+ specialitycode empty$
+ { number }
+ { specialitycode }
+ if$
+}
+
+FUNCTION {institution.or.school}
+{
+ institution empty$
+ { school}
+ { institution }
+ if$
+}
+FUNCTION {output.address.publisher}
+{
+ address empty$ location empty$ and
'skip$
- { address output
+ { address.or.location output
publisher empty$
'skip$
{ new.colon }
@@ -1284,15 +1338,16 @@ FUNCTION {empty.misc.check}
if$
}
+%%<!utf8> bbl.thesis.type "t" change.case$
+%%<utf8> bbl.thesis.type
FUNCTION {format.thesis.type}
{ type empty$
'skip$
{ pop$
- type
+ bbl.thesis.type
}
if$
}
-
%%<!utf8> { "t" change.case$ }
%%<utf8> { "" }
@@ -1434,7 +1489,16 @@ FUNCTION {add.doi}
if$
}
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+ 'skip$
+ { media empty$
+ 'skip$
+ { " " * bbl.media enclose.square.brackets * }
+ if$
+ }
+ if$
+}
@@ -1571,7 +1635,7 @@ FUNCTION {booklet}
editor.organization.after
new.block
howpublished output
- address output
+ address.or.location output
format.date "year" output.check
new.block
note output
@@ -1734,7 +1798,7 @@ FUNCTION {patent}
new.colon
format.type.number output
add.blank
- location output
+ address.or.location output
new.colon
ipc output
new.slash
@@ -1830,13 +1894,18 @@ FUNCTION {thesis}
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- type "type" output.check
+ %%type "type" output.check
+ bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1861,13 +1930,14 @@ FUNCTION {report}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check
@@ -1889,11 +1959,15 @@ FUNCTION {phdthesis}
new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1907,19 +1981,23 @@ FUNCTION {phdthesis}
fin.entry
}
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.mthesis format.thesis.type output.nonnull
+ bbl.mathesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1933,19 +2011,23 @@ FUNCTION {masterthesis}
fin.entry
}
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
{ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle add.doi add.media "title" output.check
new.colon
- bbl.dscithesis format.thesis.type output.nonnull
+ bbl.docthesis format.thesis.type output.nonnull
new.colon
- number output
+ %%number output % code of the speciality
+ specialitycode.or.number output % code of the speciality, new in v.1.2i
+ new.colon
+ titleaddon output % date of defence and approvement; new in v.1.2i
new.slash
format.authors.after output
new.semicolon
- school "school" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.block
output.address.publisher
format.date "year" output.check
@@ -1972,13 +2054,14 @@ FUNCTION {techreport}
new.colon
number output
new.slash
- institution "institution" output.check
+ %institution "institution" output.check
+ institution.or.school "institution/school" output.check
new.semicolon
format.chief.after output % from editor field
new.semicolon
format.executor.after output % from author field
new.block
- address output
+ address.or.location output
new.colon
organization output
format.date "year" output.check