diff options
| author | Karl Berry <karl@freefriends.org> | 2017-01-16 23:13:28 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-01-16 23:13:28 +0000 |
| commit | c4924cb3f7ffb2985272e1c2441d67a116f37373 (patch) | |
| tree | 9102231383106b601e8f39a1731db3886042b51e | |
| parent | abf16904fa655d4b73614dacb33af43ba0420a45 (diff) | |
gost (14jan17)
git-svn-id: svn://tug.org/texlive/trunk@42974 c570f23f-e606-0410-a88d-b1316a301751
152 files changed, 5140 insertions, 3218 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 diff --git a/Master/texmf-dist/doc/bibtex/gost/README b/Master/texmf-dist/doc/bibtex/gost/README.md index 98477117c34..6a70110f211 100644 --- a/Master/texmf-dist/doc/bibtex/gost/README +++ b/Master/texmf-dist/doc/bibtex/gost/README.md @@ -21,7 +21,7 @@ GOST 7.11 -2004 Bibliographic description and references. Rules for the abbreviation of words and word combinations in foreign European languages. GOST 7.83 -2001 Electronic editions. Basic types and imprint. -Ect. +Etc. GOST comprises 16 BibTeX styles to format bibliography in English, Russian and Ukrainian according to GOST 7.0.5-2008 and GOST 7.1-2003. Both 8-bit @@ -98,9 +98,9 @@ their use is discouraged. The |eprint| option enables formatting electronic publications. In particular, it enables |eprint|, |eprinttype|, |eprintclass|, and |doi| fields for a bibliographic entry. The styles, generated without the |eprint| option, -just ignore these fields. Starting from the version 1.2 of the GOST package, -all modern styles are compiled with this option included, and therefore the -suffix |e| which designated this option in earlier versions is not appended +just ignore these fields. Starting from the version 1.2 of the GOST package, +all modern styles are compiled with this option included, and therefore the +suffix |e| which designated this option in earlier versions is not appended to the name of style any more. The |natbib| option provides compatibility with the |natbib| package. The names @@ -218,7 +218,31 @@ Where to get from 2. http://ctan.org/pkg/gost -What's new in version 1.2h (2016.09.21) +What's new in version 1.2i (2017.01.12) + +1. Documentation and examples update (thanks to Leonid Sinev). + +2, Restored @MastersThesis instead of @MasterThesis (thanks to Leonid Sinev). + +3. Media="eresource" field is introduced in addition to the media="online" and + media="text"; if present, the media field is not ignored any more in + modern bst-styles compiled without the strict option. + +4. Location field is introduced as an alias of address field. + +5. @DSCISTHESIS entry renamed to @DOCTHESIS. + +6. School field is now treated as an alias of institution. + +7. Specialitycode is added for @THESIS and similar entries; number is treated as + alias of specialitycode. + +8. Type field in THESIS and similar entries can now accept three values + (mathesis, phdthesis, docthesis) which are translated to built-in + language-sensitive strings; any other value is reproduced literally. + + +What's new in version 1.2h (2016.08.21) 1. Minor changes in documentation. diff --git a/Master/texmf-dist/doc/bibtex/gost/dobib.cmd b/Master/texmf-dist/doc/bibtex/gost/dobib.cmd deleted file mode 100644 index 1d5a5d1572e..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/dobib.cmd +++ /dev/null @@ -1,20 +0,0 @@ -rename .\bib\examples.bib examples.bak -REM pause -copy .\bib\ex*.bib .\bib\examples.bib -REM pause -for %%f in (gost7*.tex) do pdflatex -quiet %%f -for %%f in (gost200*.tex) do pdflatex -quiet %%f - -REM pause -for %%f in (gost*.aux) do bibtex8 -B -c cp1251.csf %%f - -REM pause -for %%f in (gost7*.tex) do pdflatex %%f -for %%f in (gost200*.tex) do pdflatex %%f -for %%f in (gost2008-nat*.tex) do pdflatex %%f -for %%f in (gost2008-sort*.tex) do pdflatex %%f - -del *.aux *.out *.toc *.brf .pdf -del *.bbl -del *.blg -del *.log diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib index 310c13fe5df..e6640b96023 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib @@ -1,9 +1,9 @@ @BOOK{Vasylenko92, - author = "Василенко, М. В.", - title = "Теорія коливань: Навчальний посібник", - address = "К.", - publisher = "Вища школа", - year = 1992, - pagetotal = 430, - language = "ukrainian" + author = {Василенко, М. В.}, + title = {Теорія коливань: Навчальний посібник}, + address = {К.}, + publisher = {Вища школа}, + year = {1992}, + pagetotal = {430}, + language = {ukrainian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib index cbcc7abd144..6e1c190f7cd 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib @@ -1,10 +1,10 @@ @BOOK{Afanasyev92, - author = "Афанасьев, В. В. and Василевский, О. Н.", - title = "Расчеты электрических цепей - на программируемых микрокалькуляторах", - address = "М.", - publisher = "Энергоиздат", - year = 1992, - pagetotal = 190, - language = "russian" + author = {Афанасьев, В. В. and Василевский, О. Н.}, + title = {Расчеты электрических цепей + на программируемых микрокалькуляторах}, + address = {М.}, + publisher = {Энергоиздат}, + year = {1992}, + pagetotal = {190}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib index 43d850045ef..ea27f04c084 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib @@ -1,11 +1,11 @@ @BOOK{Makilov91, - author = "Меликов, А. З. and Пономаренко, Л. А. - and Рюмшин, П. А.", - title = "Математические модели многопотоковых - систем обслуживания", - address = "К.", - publisher = "Техніка", - year = 1991, - pagetotal = 265, - language = "russian" + author = {Меликов, А. З. and Пономаренко, Л. А. + and Рюмшин, П. А.}, + title = {Математические модели многопотоковых + систем обслуживания}, + address = {К.}, + publisher = {Техніка}, + year = {1991}, + pagetotal = {265}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib index cdd347133f8..ff7d6ac21f2 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib @@ -1,11 +1,11 @@ @BOOK{Ponomarenko86, - title = "Основы создания гибких атоматизированных производств", - author = "Л. А. Пономаренко and Л. В. Адамович - and В. Т. Музычук and А. Е. Гридасов", - editor = "Б. Б. Тимофеева", - address = "К.", - publisher = "Техніка", - year = 1986, - pagetotal = 144, - language = "russian" + title = {Основы создания гибких атоматизированных производств}, + author = {Л. А. Пономаренко and Л. В. Адамович + and В. Т. Музычук and А. Е. Гридасов}, + editor = {Б. Б. Тимофеева}, + address = {К.}, + publisher = {Техніка}, + year = {1986}, + pagetotal = {144}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib index 87b73ae64ce..2717a9c46c1 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib @@ -1,11 +1,11 @@ @BOOK{Belousova81, - title = "Системный анализ инфраструктуры - как элемент народного хозяйства", - author = "Белоусова, Н. И. and Вишняк, Е. И. - and Левит, В. Ю. and others", - address = "М.", - publisher = "Экономика", - year = 1981, - pagetotal = 62, - language = "russian" -}
\ No newline at end of file + title = {Системный анализ инфраструктуры + как элемент народного хозяйства}, + author = {Белоусова, Н. И. and Вишняк, Е. И. + and Левит, В. Ю. and others}, + address = {М.}, + publisher = {Экономика}, + year = {1981}, + pagetotal = {62}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib index f584ce2a8d8..be516123402 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib @@ -1,12 +1,12 @@ @BOOK{BibOp91, - title = "Составление библиографического описания: - Краткие правила", - organization = "Междувед. каталогизац. комис. - при Гос. б-ке СССР им.~В.~И. Ленина", - edition = "2-е, доп.", - address = "М.", - publisher = "Кн.~палата", - year = 1991, - pagetotal = 224, - language = "russian" + title = {Составление библиографического описания: + Краткие правила}, + organization = {Междувед. каталогизац. комис. + при Гос. б-ке СССР им.~В.~И. Ленина}, + edition = {2-е, доп.}, + address = {М.}, + publisher = {Кн.~палата}, + year = {1991}, + pagetotal = {224}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib index 1a08e80cb30..e4e96e837ca 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib @@ -1,10 +1,10 @@ @BOOK{Poems82, - title = "Стихи о музыке. Русские, - советские, зарубежные поэты: Сборник", - compiler = "А. Бирюкова and В. Татаринов", - address = "М.", - publisher = "Сов. композитор", - year = 1982, - pagetotal = 224, - language = "russian" + title = {Стихи о музыке. Русские, + советские, зарубежные поэты: Сборник}, + compiler = {А. Бирюкова and В. Татаринов}, + address = {М.}, + publisher = {Сов. композитор}, + year = {1982}, + pagetotal = {224}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib index 5d553c7391c..b9191a04062 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib @@ -1,9 +1,9 @@ @BOOK{HistLit82, - title = "История русской литературы: В 4 т.", - organization = "АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)", - address = "М.", - year = 1982, - Volume = "3: Расцвет реализма", - pagetotal = 876, - language = "russian" -}
\ No newline at end of file + title = {История русской литературы: В 4 т.}, + organization = {АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)}, + address = {М.}, + year = {1982}, + volume = {3: Расцвет реализма}, + pagetotal = {876}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib index a0ac9a520ff..deffa99448d 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib @@ -1,10 +1,10 @@ -@Book{Landau:eldin, - author = "Л. Д. Ландау and Е. М. Лифшиц", - title = "Теоретическая физика: учебное пособие в 10 т.", - publisher = "Наука. Гл.\ ред.\ физ.-мат.\ лит.", - address = "М.", - year = 1992, - volume = "VIII. Электродинамика сплошных сред", - edition = "3-е, испр.", - language = "russian" +@BOOK{Landau:eldin, + author = {Л. Д. Ландау and Е. М. Лифшиц}, + title = {Теоретическая физика: учебное пособие в 10 т.}, + publisher = {Наука. Гл.\ ред.\ физ.-мат.\ лит.}, + address = {М.}, + year = {1992}, + volume = {VIII. Электродинамика сплошных сред}, + edition = {3-е, испр.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib index 05c9b09ef50..b465fc9aeae 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib @@ -1,12 +1,12 @@ -@Book{BRLS94, - title = "Нарысы па гiсторыi беларуска-рускiх - лiтаратурных сувязей: У 4 кн.", - organization = "Акад.\ навук Беларусi. Iн-т лiт.", - address = "Мiнск", - publisher = "Навука i тэхнiка", - year = "1994", - volume = "2: Пачатак ХХ ст. 1900--1917 гг.", - editor = "В. А. Каваленка and I. Я. Навуменка", - pagetotal = 440, - language = "russian" +@BOOK{BRLS94, + title = {Нарысы па гiсторыi беларуска-рускiх + лiтаратурных сувязей: У 4 кн.}, + organization = {Акад.\ навук Беларусi. Iн-т лiт.}, + address = {Мiнск}, + publisher = {Навука i тэхнiка}, + year = {1994}, + volume = {2: Пачатак ХХ ст. 1900--1917 гг.}, + editor = {В. А. Каваленка and I. Я. Навуменка}, + pagetotal = {440}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib index 17649916db3..ebda00a86e9 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib @@ -1,9 +1,9 @@ @BOOK{Grosse80, - author = "Гроссе, Э. and Вайсмангель, Х.", - title = "Химия для любознательных: Пер.\ с нем.", - address = "М.", - publisher = "Химия", - year = 1980, - pagetotal = 392, - language = "russian" -}
\ No newline at end of file + author = {Гроссе, Э. and Вайсмангель, Х.}, + title = {Химия для любознательных: Пер.\ с нем.}, + address = {М.}, + publisher = {Химия}, + year = {1980}, + pagetotal = {392}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib index 544fd374dd0..16a1d96e615 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib @@ -1,10 +1,11 @@ @BOOK{GOST7184, - title = "ГОСТ 7.1.-84. Библиографическое описание документа. - Общие требования и правила составления. - --- Взамен ГОСТ 7.1.-76; Введ. 01.01.86.", - address = "М.", - publisher = "Изд-во стандартов", - year = 1984, - pagetotal = 78, - language = "russian" + key = {ГОСТ}, + title = {ГОСТ 7.1-84. Библиографическое описание документа. + Общие требования и правила составления. + --- Взамен ГОСТ 7.1-76~; введ. 01.01.86.}, + address = {М.}, + publisher = {Изд-во стандартов}, + year = {1984}, + pagetotal = {78}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib index cc94de158c2..33bb601e08f 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib @@ -1,8 +1,8 @@ @BOOK{ObchTech93, - title = "Обчислювальна і прикладна математика: Зб.наук.пр.", - address = "К.", - publisher = "Либідь", - year = 1993, - pagetotal = 99, - language = "ukrainian" -}
\ No newline at end of file + title = {Обчислювальна і прикладна математика: Зб.наук.пр.}, + address = {К.}, + publisher = {Либідь}, + year = {1993}, + pagetotal = {99}, + language = {ukrainian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib index 6b473cb8b3a..6c4e3a0bdc7 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib @@ -1,10 +1,10 @@ @BOOK{Bibdelo86, - title = "Библиотечное дело: Терминол. словарь", - composer = "И. М. Суслова and Л. Н. Уланова", - edition = "2-е изд.", - address = "М.", - publisher = "Книга", - year = 1986, - pagetotal = 224, - language = "russian" -}
\ No newline at end of file + title = {Библиотечное дело: Терминол. словарь}, + composer = {И. М. Суслова and Л. Н. Уланова}, + edition = {2-е изд.}, + address = {М.}, + publisher = {Книга}, + year = {1986}, + pagetotal = {224}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib index 9b8b4a3bd0d..e3b3428a7f4 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib @@ -1,11 +1,11 @@ @INBOOK{Ponomarenko79, - author = "Пономаренко, Л. А.", - title = "Организующая система", - booktitle = "Автоматизация технологических процессов - в прокатном производстве", - address = "М.", - publisher = "Металлургия", - year = 1979, - pages = "141-148", - language = "russian" + author = {Пономаренко, Л. А.}, + title = {Организующая система}, + booktitle = {Автоматизация технологических процессов + в прокатном производстве}, + address = {М.}, + publisher = {Металлургия}, + year = {1979}, + pages = {141-148}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib index 42c938d6efd..7d086ef71ff 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib @@ -1,11 +1,11 @@ @INBOOK{Zeyts70, - author = "Зейтц, Ф.", - title = "О приведении пространственных групп", - booktitle = "Симметрия в твердом теле", - bookauthor = "Нокс, Р. and Голд, А.", - address = "М.", - publisher = "Наука", - year = 1970, - pages = "172--186", - language = "russian" + author = {Зейтц, Ф.}, + title = {О приведении пространственных групп}, + booktitle = {Симметрия в твердом теле}, + bookauthor = {Нокс, Р. and Голд, А.}, + address = {М.}, + publisher = {Наука}, + year = {1970}, + pages = {172--186}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib index 5ab6ef5c9d3..e73a2859d70 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib @@ -1,12 +1,12 @@ @INCOLLECTION{Ponoomarenko76, - author = "Пономаренко, Л. А.", - title = "Структура системы прерывания с ситуационными - приоритетами в АСУТП станов горячей прокатки", - booktitle = "Разработка автоматизированных систем управления - технологическими процессами", - address = "Тбилиси", - publisher = "Сабчота Сакартвело", - year = 1976, - pages = "3-16", - language = "russian" + author = {Пономаренко, Л. А.}, + title = {Структура системы прерывания с ситуационными + приоритетами в АСУТП станов горячей прокатки}, + booktitle = {Разработка автоматизированных систем управления + технологическими процессами}, + address = {Тбилиси}, + publisher = {Сабчота Сакартвело}, + year = {1976}, + pages = {3-16}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib index 23091c47b80..d3396fb15a2 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib @@ -1,10 +1,10 @@ -@Article{Malikov92, - author = "Меликов, А. З. and Пономаренко, Л. А.", - title = "Оптимизация цифровой сети интегрального обслуживания - с конечным числом пользователей и блокировками", - journal = "Автоматика и телемеханика", - year = 1992, - number = 6, - pages = "34-38", - language = "russian" +@ARTICLE{Malikov92, + author = {Меликов, А. З. and Пономаренко, Л. А.}, + title = {Оптимизация цифровой сети интегрального обслуживания + с конечным числом пользователей и блокировками}, + journal = {Автоматика и телемеханика}, + year = {1992}, + number = {6}, + pages = {34-38}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib index 26b7199b5b1..00f2d3e8697 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib @@ -1,11 +1,11 @@ -@Article{Ponomarenko86a, - author = "Пономаренко, Л. А. and Меликов, А. З.", - title = "Ситуационное управление многоканальной системой - с переменной структурой обслуживания неоднородного потока", - journal = "Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук", - year = 1986, - volume = 7, - number = 6, - pages = "79-83", - language = "russian" +@ARTICLE{Ponomarenko86a, + author = {Пономаренко, Л. А. and Меликов, А. З.}, + title = {Ситуационное управление многоканальной системой + с переменной структурой обслуживания неоднородного потока}, + journal = {Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук}, + year = {1986}, + volume = {7}, + number = {6}, + pages = {79-83}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib index 437c6d138af..5351992600a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib @@ -1,8 +1,8 @@ -@Article{ dixit.pindyck:options, - title = {The Options Approach to Capital Investment}, - author = {Avinash K. Dixit and Robert S. Pindyck}, - journal = {Harvard Business Review}, - year = {1995}, - month = {May-June}, - pages = {105--115} +@ARTICLE{dixit.pindyck:options, + title = {The Options Approach to Capital Investment}, + author = {Avinash K. Dixit and Robert S. Pindyck}, + journal = {Harvard Business Review}, + year = {1995}, + month = {May-June}, + pages = {105--115}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib index 9633849682d..b9584ca4123 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib @@ -1,10 +1,10 @@ @ARTICLE{RosGaz-article, - title = "Федеральный закон о внесении изменений - и дополнений в Семейный кодекс Российской Федерации", - journal = "Российская газета", - year = 1997, - month = "19 нояб", - pages = 4, - note = "Российская Федерация. Законы", - language = "russian" + title = {Федеральный закон о внесении изменений + и дополнений в Семейный кодекс Российской Федерации}, + journal = {Российская газета}, + year = {1997}, + month = {19 нояб}, + pages = {4}, + note = {Российская Федерация. Законы}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib index 8bba8804421..7c305452e68 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib @@ -1,11 +1,11 @@ @INBOOK{Dolmatovskiy88, - author = "Долматовский, Ю. А.", - title = "Электромобиль", - booktitle = "БСЭ", - edition = "3-е", - address = "М.", - year = 1988, - volume = 30, - pages = 72, - language = "russian" + author = {Долматовский, Ю. А.}, + title = {Электромобиль}, + booktitle = {БСЭ}, + edition = {3-е}, + address = {М.}, + year = {1988}, + volume = {30}, + pages = {72}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib index 79dff47edf5..8a9d3979f7f 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib @@ -1,14 +1,14 @@ @INPROCEEDINGS{Ponomarenko88, - author = "Пономаренко, Л. А. and Жучкова, И. В.", - title = "Оптимальное назначение приоритетов - при организации доступа в локальных - вычислительных сетях АСУТП", - booktitle = {Труды Междунар.\ конф.\ - <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)}, - volume = 1, - address = "Рига", - publisher = "ИЭВТ АН Латвии", - year = 1988, - pages = "149-153", - language = "russian" + author = {Пономаренко, Л. А. and Жучкова, И. В.}, + title = {Оптимальное назначение приоритетов + при организации доступа в локальных + вычислительных сетях АСУТП}, + booktitle = {Труды Междунар.\ конф.\ + <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)}, + volume = {1}, + address = {Рига}, + publisher = {ИЭВТ АН Латвии}, + year = {1988}, + pages = {149-153}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib index 8820824a1ee..59d5fd3c678 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib @@ -1,9 +1,9 @@ @INPROCEEDINGS{Melikov95, - author = "Melikov, A. Z. and Ponomarenko, L. A.", - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {Melikov, A. Z. and Ponomarenko, L. A.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib index 37bf2eeb99e..cf0f2c1c930 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib @@ -1,30 +1,28 @@ @INPROCEEDINGS{Gojchuk98, - author="Гойчук, А. Ф.", - title="Особливості етіології і патогенезу поперечного раку - дуба звичайного в Україні", - booktitle="Науковий вісник Національного - аграрного університету", - editor="Мельничука, Д. О. and others", - address="К.", - publisher="НАУ", - year=1998, - series="Вип. 8: Лісівництво", - pages="168--173", - language="ukrainian" + author = {Гойчук, А. Ф.}, + title = {Особливості етіології і патогенезу поперечного раку + дуба звичайного в Україні}, + booktitle = {Науковий вісник Національного + аграрного університету}, + editor = {Мельничука, Д. О. and others}, + address = {К.}, + publisher = {НАУ}, + year = {1998}, + series = {Вип. 8: Лісівництво}, + pages = {168--173}, + language = {ukrainian}, } @INPROCEEDINGS{Polyakov98a, - author="М. О. Поляков", - title="Системний ефект агрегування лісосік в управлінні - лісовими ресурсами на регіональному рівні", - crossref="Gojchuk98", - annote = "Розглянуто ефект агрегування елементарних - господарських одиниць на розмір розрахункової лісосіки. - Запропоновано метод визначення максимально допустимого розміру - рубання за площею на рівні регіону в контексті системи - державного регулювання лісокористування для умов ринкової - економіки", - pages="213--220" + author = {М. О. Поляков}, + title = {Системний ефект агрегування лісосік в управлінні + лісовими ресурсами на регіональному рівні}, + crossref = {Gojchuk98}, + annote = {Розглянуто ефект агрегування елементарних + господарських одиниць на розмір розрахункової лісосіки. + Запропоновано метод визначення максимально допустимого розміру + рубання за площею на рівні регіону в контексті системи + державного регулювання лісокористування для умов ринкової + економіки}, + pages = {213--220}, } - -
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib index b330728743a..804f156ba17 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib @@ -1,17 +1,16 @@ @INPROCEEDINGS{TranskSpivrob99:Purich, - author = "Пурич, Штефан", - title = "{Р}умынско-{У}краинское трансграничное сотрудничество: - проблемы и перспективы", - language = "russian", - booktitle = "Транскордонне співробітництво у поліетнічних регіонах - {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового - симпозіуму", - editor = "Макара, Ю.", - address = "Чернівці", - publisher = "Золоті литаври", - organization = "Буковинський політологічний центр", - year = 1999, - pagetotal = 196, - booklanguage = "ukrainian" + author = {Пурич, Штефан}, + title = {{Р}умынско-{У}краинское трансграничное сотрудничество: + проблемы и перспективы}, + language = {russian}, + booktitle = {Транскордонне співробітництво у поліетнічних регіонах + {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового + симпозіуму}, + editor = {Макара, Ю.}, + address = {Чернівці}, + publisher = {Золоті литаври}, + organization = {Буковинський політологічний центр}, + year = {1999}, + pagetotal = {196}, + booklanguage = {ukrainian}, } -
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib index fabe65b8f0f..bdd9cdd95b0 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib @@ -1,20 +1,20 @@ @INPROCEEDINGS{Selikov95, - author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } @INPROCEEDINGS{Selikov+95, - author = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515", - language = "russian" + author = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib index fe190c340a6..a6769ddfb48 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib @@ -1,14 +1,14 @@ @PHDTHESIS{Luus82, - author = "Луус, Роман Аркадьевич", - title = "Исследование оборудования с пневмовакуумным - приводом для захвата, перемещения и фиксации - при обработке пористых и легкоповреждаемых - строительных изделий", - type = "Дисссертация на соискание ученой степени кандидата технических наук", - number = "05.05.04", - school = "Моск.\ строит.\ ин-т", - address = "М.", - year = 1982, - pagetotal = 212, - language = "russian" + author = {Луус, Роман Аркадьевич}, + title = {Исследование оборудования с пневмовакуумным + приводом для захвата, перемещения и фиксации + при обработке пористых и легкоповреждаемых + строительных изделий}, + type = {Диссертация на соискание ученой степени кандидата технических наук}, + number = {05.05.04}, + institution = {Моск.\ строит.\ ин-т}, + address = {М.}, + year = {1982}, + pagetotal = {212}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib index 3ee525e0f90..9464e2b0086 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib @@ -1,11 +1,11 @@ -@DSciTHESIS{KIA95-default, - author = "Котельников, Игорь Александрович", - title = "Теория магнитного удержания двухкомпонентной плазмы - в открытых ловушках", - number = "01.04.08", - school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН", - address = "Новосибирск", - year = 1995, - pagetotal = 350, - language = "russian" +@DOCTHESIS{KIA95-default, + author = {Котельников, Игорь Александрович}, + title = {Теория магнитного удержания двухкомпонентной плазмы + в открытых ловушках}, + number = {01.04.08}, + institution = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН}, + address = {Новосибирск}, + year = {1995}, + pagetotal = {350}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib new file mode 100644 index 00000000000..49be1815053 --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib @@ -0,0 +1,17 @@ +@MASTERSTHESIS{mastersthesis-minimal, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + year = {1988}, + institution = {Stanford University}, +} + +@MASTERSTHESIS{mastersthesis-full, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + month = jun, + note = {This is a full MASTERSTHESIS entry}, + type = {Master's project}, + year = {1988}, + address = {English Department}, + institution = {Stanford University}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib deleted file mode 100644 index 8c3e7a0450b..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib +++ /dev/null @@ -1,12 +0,0 @@ -@THESIS{KIA85-autoref, - author = "Котельников, Игорь Александрович", - title = "Теория магнитного удержания двухкомпонентной плазмы - в открытых ловушках", - type = "Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук", - number = "01.04.08", - school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН", - address = "Новосибирск", - year = 1995, - pagetotal = 17, - language = "russian" -} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib index ba26eb15ccd..950f353aef1 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib @@ -1,11 +1,11 @@ @BOOK{Ponomarenko76, - author = "Пономаренко, Л. А. and Буадзе, В. В.", - title = "Математические модели и алгоритмы сбора - и обработки информации в АСУТП непрерывных - станов горячей прокатки", - address = "К.", - year = 1976, - pagetotal = 37, - language = "russian", - note = "(Препр./ АН Украины. Ин-т кибернетики; 76-76)" + author = {Пономаренко, Л. А. and Буадзе, В. В.}, + title = {Математические модели и алгоритмы сбора + и обработки информации в АСУТП непрерывных + станов горячей прокатки}, + address = {К.}, + year = {1976}, + pagetotal = {37}, + language = {russian}, + note = {(Препр./ АН Украины. Ин-т кибернетики; 76-76)}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib index 2c3d544f788..f1bd612b343 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib @@ -1,15 +1,15 @@ @REPORT{Report81-rep, - title = {Проведение испытаний и исследований - теплотехнических свойств камер {КХС-2-12-ВЗ} - и {КХС-2-12-КЗІО}}, - institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, - address = "М.", + title = {Проведение испытаний и исследований + теплотехнических свойств камер {КХС-2-12-ВЗ} + и {КХС-2-12-КЗІО}}, + institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, + address = {М.}, organization = {ВИНИТИ}, - year = 1981, - pagetotal = 90, - type = "Отчет о {НИР}", - editor = "Путин, В. В.", - author = "Медведев, Д. А. and others", - note = {Инв.\ № В 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + type = {Отчет о {НИР}}, + editor = {Путин, В. В.}, + author = {Медведев, Д. А. and others}, + note = {Инв.\ № В 119692}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib index 1361433bedb..c8c698a48a5 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib @@ -1,12 +1,12 @@ @REPORT{Report81b-rep-notype, - title = {Проведение испытаний и исследований - теплотехнических свойств камер {КХС-2-12-ВЗ} - и {КХС-2-12-КЗІО}}, - institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, - address = "М.", + title = {Проведение испытаний и исследований + теплотехнических свойств камер {КХС-2-12-ВЗ} + и {КХС-2-12-КЗІО}}, + institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, + address = {М.}, organization = {ВИНИТИ}, - year = 1981, - pagetotal = 90, - note = {Инв.\ № В 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + note = {Инв.\ № В 119692}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib index c2a26220222..c900abee931 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib @@ -1,14 +1,14 @@ @TECHREPORT{Report81-techrep, - title = {Проведение испытаний и исследований - теплотехнических свойств камер {КХС-2-12-ВЗ} - и {КХС-2-12-КЗІО}}, - institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, - address = "М.", + title = {Проведение испытаний и исследований + теплотехнических свойств камер {КХС-2-12-ВЗ} + и {КХС-2-12-КЗІО}}, + institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, + address = {М.}, organization = {ВИНИТИ}, - year = 1981, - pagetotal = 90, - editor = "Путин, В. В.", - author = "Медведев, Д. А. and others", - note = {Инв.\ № В 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + editor = {Путин, В. В.}, + author = {Медведев, Д. А. and others}, + note = {Инв.\ № В 119692}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib index 1f07d1fe1a5..cc599b52b7b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib @@ -1,12 +1,11 @@ @BOOK{CatalogMamals81, - title = {Каталог млекопитающих СССР. - Плиоцен "--- современность}, - organization = "АН СССР, Зоол.\ ин-т", - editor = "И. М. Громова and Г. И. Барановой", - address = "Л.", - publisher = "Наука, Ленинг.\ отд-ние", - year = 1981, - pagetotal = 456, - language = "russian" + title = {Каталог млекопитающих СССР. + Плиоцен "--- современность}, + organization = {АН СССР, Зоол.\ ин-т}, + editor = {И. М. Громова and Г. И. Барановой}, + address = {Л.}, + publisher = {Наука, Ленинг.\ отд-ние}, + year = {1981}, + pagetotal = {456}, + language = {russian}, } - diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib index 7514518cfe2..cff85edfbe4 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib @@ -1,12 +1,12 @@ @BOOK{Instr86, - title = "Типовая инструкция по эксплуатации - топливоотдачи тепловых электростанций: - ТИ 34-70-044-85: Утв. Гл. техн. упр. - по эксплуатации энергосистем 01.10.85: - Срок действия установлен с 01.01.86 до 01.01.95", - organization = "М-во энергетики и электрификации СССР", - address = "М.", - year = 1986, - pagetotal = 43, - language = "russian" + title = {Типовая инструкция по эксплуатации + топливоотдачи тепловых электростанций~: + ТИ 34-70-044-85~: Утв. Гл. техн. упр. + по эксплуатации энергосистем 01.10.85~: + Срок действия установлен с 01.01.86 до 01.01.95}, + organization = {М-во энергетики и электрификации СССР}, + address = {М.}, + year = {1986}, + pagetotal = {43}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib index 77d355140f4..9b58759802c 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib @@ -1,18 +1,18 @@ -@online{ wiki:latex, - author = "Wikipedia", - title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia", - year = "2012", - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" +@ONLINE{wiki:latex, + author = {Wikipedia}, + title = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia}, + year = {2012}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, } -@online{ wiki:latex-2, - author = "Wikipedia", - title = "{\LaTeX}", - howpublished = "Wikipedia, The Free Encyclopedia", - year = "2012", - eprint ="wiki/LaTeX", - eprinttype = {WikiPedia}, - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" +@ONLINE{wiki:latex-2, + author = {Wikipedia}, + title = {{\LaTeX}}, + howpublished = {Wikipedia, The Free Encyclopedia}, + year = {2012}, + eprint = {wiki/LaTeX}, + eprinttype = {WikiPedia}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib index 9c4ed685f25..c903934e1d0 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib @@ -1,10 +1,10 @@ -@online{ phys:moodle, - author = {Черкасский, В. С.}, - title = {Классная комната}, - howpublished = "Физический факультет", - organization = "НГУ", - year = 2012, - url = {http://www.phys.nsu.ru/moodle/}, - urldate = "16.01.2012", - language = "russian" +@ONLINE{phys:moodle, + author = {Черкасский, В. С.}, + title = {Классная комната}, + howpublished = {Физический факультет}, + organization = {НГУ}, + year = {2012}, + url = {http://www.phys.nsu.ru/moodle/}, + urldate = {16.01.2012}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib index 84f1c44976f..35f92171c2a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib @@ -4,5 +4,5 @@ url = {http://www-nds.iaea.org/exfor}, address = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria}, year = {2012}, - medium = {Electronic resource} + media = {eresource} } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib index f8954251c80..530ca4e2eb8 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib @@ -1,25 +1,25 @@ @BOOK{IsaacNewton, author = {Newton, {\relax Sir Isaac}}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, publisher = {William Innys}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {eresource}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } @BOOK{IsaacNewton-sl:sn, author = {{\relax Sir I}saac Newton}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {online}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } -% publisher = {William Innys}, +% publisher = {William Innys}, diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib new file mode 100644 index 00000000000..de6e440d0af --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib @@ -0,0 +1,32 @@ +@BOOK{Encyclopedia, + title = {Художественная энциклопедия зарубежного классического искусства}, + publisher = {Большая Рос. энцикл.}, + year = {1996}, + address = {М.}, + note = {1 электрон. опт. диск (CD-ROM)}, + language = {russian}, + media = {eresource}, +} + +@ARTICLE{Nasirova, + title = {Модели государственного регулирования страховой деятельности}, + author = {Насырова, Г. А.}, + language = {russian}, + note = {Режим доступа: http://vestnik.fa.ru/4(28)2003/4.html}, + number = {4}, + year = {2003}, + journal = {Вестник Финансовой академии}, + media2 = {eresource}, + media = {online}, +} + +@BOOK{kremlincd, + title = {Московский Кремль}, + titleaddon = {трехмер. путеводитель}, + language = {russian}, + note = {CD-ROM}, + date = {2007}, + location = {М.}, + publisher = {Новый Диск}, + media = {eresource}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib index 4a115383783..416cb5b91c9 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib @@ -1,15 +1,15 @@ -@article{PhysRevLett.101.085006, - author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, - volume = {101}, - journal = {Phys. Rev. Lett.}, - month = {Aug}, - pagetotal = {4}, - title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, - year = {2008}, - doi = {10.1103/PhysRevLett.101.085006}, - issue = {8}, - publisher = {American Physical Society}, - pages = {085006} +@ARTICLE{PhysRevLett.101.085006, + author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, + volume = {101}, + journal = {Phys. Rev. Lett.}, + month = {Aug}, + pagetotal = {4}, + title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, + year = {2008}, + doi = {10.1103/PhysRevLett.101.085006}, + issue = {8}, + publisher = {American Physical Society}, + pages = {085006}, } % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006}, diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib index 0b7d912e5f1..b9e2ce43b5b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib @@ -1,27 +1,27 @@ @ARTICLE{1998PhRvE..57.7111K, - author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, - title = "{Turbulent cascades in anisotropic magnetohydrodynamics}", - journal = pre, - keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, - year = 1998, - month = jun, - volume = 57, - pages = {7111-7121}, - doi = {10.1103/PhysRevE.57.7111}, - adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, - adsnote = {Provided by the SAO/NASA Astrophysics Data System} + author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, + title = {{Turbulent cascades in anisotropic magnetohydrodynamics}}, + journal = pre, + keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, + year = {1998}, + month = jun, + volume = {57}, + pages = {7111-7121}, + doi = {10.1103/PhysRevE.57.7111}, + adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System}, } @ARTICLE{1998UFN, - author = {Котельников, И. А. and Астрелин, В. Т.}, - title = "Теория плазменного эмиттера положительных ионов", - journal = ufn, - keywords = {плазменный эмиттер, критерий Бома}, - year = 2015, - month = jul, - volume = 185, - pages = {753-771}, - language = {russian}, - doi = {10.3367/UFNr.0185.201507c.0753}, - url = {http://ufn.ru/ru/articles/2015/7/c/}, + author = {Котельников, И. А. and Астрелин, В. Т.}, + title = {Теория плазменного эмиттера положительных ионов}, + journal = ufn, + keywords = {плазменный эмиттер, критерий Бома}, + year = {2015}, + month = jul, + volume = {185}, + pages = {753-771}, + language = {russian}, + doi = {10.3367/UFNr.0185.201507c.0753}, + url = {http://ufn.ru/ru/articles/2015/7/c/}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib index 2cb09485fd1..7c86f15b6e0 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib @@ -1,40 +1,40 @@ @PATENT{patent1, - author = {Э. В. Тернер}, + author = {Э. В. Тернер}, authorcountry = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, + title = {Одноразовая ракета-носитель}, + media = {text}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, requestnumber = {000108705/28}, - requestdate = {07.04.2000}, + requestdate = {07.04.2000}, publicationdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prioritydate = {09.04.1999}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate= {09.04.1999}, prioritynumber = {09/289, 037}, prioritycountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, + author = {В. И. Чугаева}, authorcountry = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, + title = {Приемопередающее устройство}, + media = {text}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, requestnumber = {000108705/28}, - date = {18.12.2000}, + date = {18.12.2000}, publicationdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib index b60690a2c4f..c017576999b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib +++ b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib @@ -1,452 +1,519 @@ @BOOK{Vasylenko92, - author = "Василенко, М. В.", - title = "Теорія коливань: Навчальний посібник", - address = "К.", - publisher = "Вища школа", - year = 1992, - pagetotal = 430, - language = "ukrainian" + author = {Василенко, М. В.}, + title = {Теорія коливань: Навчальний посібник}, + address = {К.}, + publisher = {Вища школа}, + year = {1992}, + pagetotal = {430}, + language = {ukrainian}, } @BOOK{Afanasyev92, - author = "Афанасьев, В. В. and Василевский, О. Н.", - title = "Расчеты электрических цепей - на программируемых микрокалькуляторах", - address = "М.", - publisher = "Энергоиздат", - year = 1992, - pagetotal = 190, - language = "russian" + author = {Афанасьев, В. В. and Василевский, О. Н.}, + title = {Расчеты электрических цепей + на программируемых микрокалькуляторах}, + address = {М.}, + publisher = {Энергоиздат}, + year = {1992}, + pagetotal = {190}, + language = {russian}, } @BOOK{Makilov91, - author = "Меликов, А. З. and Пономаренко, Л. А. - and Рюмшин, П. А.", - title = "Математические модели многопотоковых - систем обслуживания", - address = "К.", - publisher = "Техніка", - year = 1991, - pagetotal = 265, - language = "russian" + author = {Меликов, А. З. and Пономаренко, Л. А. + and Рюмшин, П. А.}, + title = {Математические модели многопотоковых + систем обслуживания}, + address = {К.}, + publisher = {Техніка}, + year = {1991}, + pagetotal = {265}, + language = {russian}, } @BOOK{Ponomarenko86, - title = "Основы создания гибких атоматизированных производств", - author = "Л. А. Пономаренко and Л. В. Адамович - and В. Т. Музычук and А. Е. Гридасов", - editor = "Б. Б. Тимофеева", - address = "К.", - publisher = "Техніка", - year = 1986, - pagetotal = 144, - language = "russian" + title = {Основы создания гибких атоматизированных производств}, + author = {Л. А. Пономаренко and Л. В. Адамович + and В. Т. Музычук and А. Е. Гридасов}, + editor = {Б. Б. Тимофеева}, + address = {К.}, + publisher = {Техніка}, + year = {1986}, + pagetotal = {144}, + language = {russian}, } @BOOK{Belousova81, - title = "Системный анализ инфраструктуры - как элемент народного хозяйства", - author = "Белоусова, Н. И. and Вишняк, Е. И. - and Левит, В. Ю. and others", - address = "М.", - publisher = "Экономика", - year = 1981, - pagetotal = 62, - language = "russian" -}@BOOK{BibOp91, - title = "Составление библиографического описания: - Краткие правила", - organization = "Междувед. каталогизац. комис. - при Гос. б-ке СССР им.~В.~И. Ленина", - edition = "2-е, доп.", - address = "М.", - publisher = "Кн.~палата", - year = 1991, - pagetotal = 224, - language = "russian" + title = {Системный анализ инфраструктуры + как элемент народного хозяйства}, + author = {Белоусова, Н. И. and Вишняк, Е. И. + and Левит, В. Ю. and others}, + address = {М.}, + publisher = {Экономика}, + year = {1981}, + pagetotal = {62}, + language = {russian}, +} +@BOOK{BibOp91, + title = {Составление библиографического описания: + Краткие правила}, + organization = {Междувед. каталогизац. комис. + при Гос. б-ке СССР им.~В.~И. Ленина}, + edition = {2-е, доп.}, + address = {М.}, + publisher = {Кн.~палата}, + year = {1991}, + pagetotal = {224}, + language = {russian}, } @BOOK{Poems82, - title = "Стихи о музыке. Русские, - советские, зарубежные поэты: Сборник", - compiler = "А. Бирюкова and В. Татаринов", - address = "М.", - publisher = "Сов. композитор", - year = 1982, - pagetotal = 224, - language = "russian" + title = {Стихи о музыке. Русские, + советские, зарубежные поэты: Сборник}, + compiler = {А. Бирюкова and В. Татаринов}, + address = {М.}, + publisher = {Сов. композитор}, + year = {1982}, + pagetotal = {224}, + language = {russian}, } @BOOK{HistLit82, - title = "История русской литературы: В 4 т.", - organization = "АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)", - address = "М.", - year = 1982, - Volume = "3: Расцвет реализма", - pagetotal = 876, - language = "russian" -}@Book{Landau:eldin, - author = "Л. Д. Ландау and Е. М. Лифшиц", - title = "Теоретическая физика: учебное пособие в 10 т.", - publisher = "Наука. Гл.\ ред.\ физ.-мат.\ лит.", - address = "М.", - year = 1992, - volume = "VIII. Электродинамика сплошных сред", - edition = "3-е, испр.", - language = "russian" -} -@Book{BRLS94, - title = "Нарысы па гiсторыi беларуска-рускiх - лiтаратурных сувязей: У 4 кн.", - organization = "Акад.\ навук Беларусi. Iн-т лiт.", - address = "Мiнск", - publisher = "Навука i тэхнiка", - year = "1994", - volume = "2: Пачатак ХХ ст. 1900--1917 гг.", - editor = "В. А. Каваленка and I. Я. Навуменка", - pagetotal = 440, - language = "russian" + title = {История русской литературы: В 4 т.}, + organization = {АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)}, + address = {М.}, + year = {1982}, + volume = {3: Расцвет реализма}, + pagetotal = {876}, + language = {russian}, +} +@BOOK{Landau:eldin, + author = {Л. Д. Ландау and Е. М. Лифшиц}, + title = {Теоретическая физика: учебное пособие в 10 т.}, + publisher = {Наука. Гл.\ ред.\ физ.-мат.\ лит.}, + address = {М.}, + year = {1992}, + volume = {VIII. Электродинамика сплошных сред}, + edition = {3-е, испр.}, + language = {russian}, +} +@BOOK{BRLS94, + title = {Нарысы па гiсторыi беларуска-рускiх + лiтаратурных сувязей: У 4 кн.}, + organization = {Акад.\ навук Беларусi. Iн-т лiт.}, + address = {Мiнск}, + publisher = {Навука i тэхнiка}, + year = {1994}, + volume = {2: Пачатак ХХ ст. 1900--1917 гг.}, + editor = {В. А. Каваленка and I. Я. Навуменка}, + pagetotal = {440}, + language = {russian}, } @BOOK{Grosse80, - author = "Гроссе, Э. and Вайсмангель, Х.", - title = "Химия для любознательных: Пер.\ с нем.", - address = "М.", - publisher = "Химия", - year = 1980, - pagetotal = 392, - language = "russian" -}@BOOK{GOST7184, - title = "ГОСТ 7.1.-84. Библиографическое описание документа. - Общие требования и правила составления. - --- Взамен ГОСТ 7.1.-76; Введ. 01.01.86.", - address = "М.", - publisher = "Изд-во стандартов", - year = 1984, - pagetotal = 78, - language = "russian" + author = {Гроссе, Э. and Вайсмангель, Х.}, + title = {Химия для любознательных: Пер.\ с нем.}, + address = {М.}, + publisher = {Химия}, + year = {1980}, + pagetotal = {392}, + language = {russian}, +} +@BOOK{GOST7184, + key = {ГОСТ}, + title = {ГОСТ 7.1-84. Библиографическое описание документа. + Общие требования и правила составления. + --- Взамен ГОСТ 7.1-76~; введ. 01.01.86.}, + address = {М.}, + publisher = {Изд-во стандартов}, + year = {1984}, + pagetotal = {78}, + language = {russian}, } @BOOK{ObchTech93, - title = "Обчислювальна і прикладна математика: Зб.наук.пр.", - address = "К.", - publisher = "Либідь", - year = 1993, - pagetotal = 99, - language = "ukrainian" -}@BOOK{Bibdelo86, - title = "Библиотечное дело: Терминол. словарь", - composer = "И. М. Суслова and Л. Н. Уланова", - edition = "2-е изд.", - address = "М.", - publisher = "Книга", - year = 1986, - pagetotal = 224, - language = "russian" -}@INBOOK{Ponomarenko79, - author = "Пономаренко, Л. А.", - title = "Организующая система", - booktitle = "Автоматизация технологических процессов - в прокатном производстве", - address = "М.", - publisher = "Металлургия", - year = 1979, - pages = "141-148", - language = "russian" + title = {Обчислювальна і прикладна математика: Зб.наук.пр.}, + address = {К.}, + publisher = {Либідь}, + year = {1993}, + pagetotal = {99}, + language = {ukrainian}, +} +@BOOK{Bibdelo86, + title = {Библиотечное дело: Терминол. словарь}, + composer = {И. М. Суслова and Л. Н. Уланова}, + edition = {2-е изд.}, + address = {М.}, + publisher = {Книга}, + year = {1986}, + pagetotal = {224}, + language = {russian}, +} +@INBOOK{Ponomarenko79, + author = {Пономаренко, Л. А.}, + title = {Организующая система}, + booktitle = {Автоматизация технологических процессов + в прокатном производстве}, + address = {М.}, + publisher = {Металлургия}, + year = {1979}, + pages = {141-148}, + language = {russian}, } @INBOOK{Zeyts70, - author = "Зейтц, Ф.", - title = "О приведении пространственных групп", - booktitle = "Симметрия в твердом теле", - bookauthor = "Нокс, Р. and Голд, А.", - address = "М.", - publisher = "Наука", - year = 1970, - pages = "172--186", - language = "russian" + author = {Зейтц, Ф.}, + title = {О приведении пространственных групп}, + booktitle = {Симметрия в твердом теле}, + bookauthor = {Нокс, Р. and Голд, А.}, + address = {М.}, + publisher = {Наука}, + year = {1970}, + pages = {172--186}, + language = {russian}, } @INCOLLECTION{Ponoomarenko76, - author = "Пономаренко, Л. А.", - title = "Структура системы прерывания с ситуационными - приоритетами в АСУТП станов горячей прокатки", - booktitle = "Разработка автоматизированных систем управления - технологическими процессами", - address = "Тбилиси", - publisher = "Сабчота Сакартвело", - year = 1976, - pages = "3-16", - language = "russian" -} -@Article{Malikov92, - author = "Меликов, А. З. and Пономаренко, Л. А.", - title = "Оптимизация цифровой сети интегрального обслуживания - с конечным числом пользователей и блокировками", - journal = "Автоматика и телемеханика", - year = 1992, - number = 6, - pages = "34-38", - language = "russian" -} -@Article{Ponomarenko86a, - author = "Пономаренко, Л. А. and Меликов, А. З.", - title = "Ситуационное управление многоканальной системой - с переменной структурой обслуживания неоднородного потока", - journal = "Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук", - year = 1986, - volume = 7, - number = 6, - pages = "79-83", - language = "russian" -} -@Article{ dixit.pindyck:options, - title = {The Options Approach to Capital Investment}, - author = {Avinash K. Dixit and Robert S. Pindyck}, - journal = {Harvard Business Review}, - year = {1995}, - month = {May-June}, - pages = {105--115} + author = {Пономаренко, Л. А.}, + title = {Структура системы прерывания с ситуационными + приоритетами в АСУТП станов горячей прокатки}, + booktitle = {Разработка автоматизированных систем управления + технологическими процессами}, + address = {Тбилиси}, + publisher = {Сабчота Сакартвело}, + year = {1976}, + pages = {3-16}, + language = {russian}, +} +@ARTICLE{Malikov92, + author = {Меликов, А. З. and Пономаренко, Л. А.}, + title = {Оптимизация цифровой сети интегрального обслуживания + с конечным числом пользователей и блокировками}, + journal = {Автоматика и телемеханика}, + year = {1992}, + number = {6}, + pages = {34-38}, + language = {russian}, +} +@ARTICLE{Ponomarenko86a, + author = {Пономаренко, Л. А. and Меликов, А. З.}, + title = {Ситуационное управление многоканальной системой + с переменной структурой обслуживания неоднородного потока}, + journal = {Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук}, + year = {1986}, + volume = {7}, + number = {6}, + pages = {79-83}, + language = {russian}, +} +@ARTICLE{dixit.pindyck:options, + title = {The Options Approach to Capital Investment}, + author = {Avinash K. Dixit and Robert S. Pindyck}, + journal = {Harvard Business Review}, + year = {1995}, + month = {May-June}, + pages = {105--115}, } @ARTICLE{RosGaz-article, - title = "Федеральный закон о внесении изменений - и дополнений в Семейный кодекс Российской Федерации", - journal = "Российская газета", - year = 1997, - month = "19 нояб", - pages = 4, - note = "Российская Федерация. Законы", - language = "russian" + title = {Федеральный закон о внесении изменений + и дополнений в Семейный кодекс Российской Федерации}, + journal = {Российская газета}, + year = {1997}, + month = {19 нояб}, + pages = {4}, + note = {Российская Федерация. Законы}, + language = {russian}, } @INBOOK{Dolmatovskiy88, - author = "Долматовский, Ю. А.", - title = "Электромобиль", - booktitle = "БСЭ", - edition = "3-е", - address = "М.", - year = 1988, - volume = 30, - pages = 72, - language = "russian" + author = {Долматовский, Ю. А.}, + title = {Электромобиль}, + booktitle = {БСЭ}, + edition = {3-е}, + address = {М.}, + year = {1988}, + volume = {30}, + pages = {72}, + language = {russian}, } @INPROCEEDINGS{Ponomarenko88, - author = "Пономаренко, Л. А. and Жучкова, И. В.", - title = "Оптимальное назначение приоритетов - при организации доступа в локальных - вычислительных сетях АСУТП", - booktitle = {Труды Междунар.\ конф.\ - <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)}, - volume = 1, - address = "Рига", - publisher = "ИЭВТ АН Латвии", - year = 1988, - pages = "149-153", - language = "russian" + author = {Пономаренко, Л. А. and Жучкова, И. В.}, + title = {Оптимальное назначение приоритетов + при организации доступа в локальных + вычислительных сетях АСУТП}, + booktitle = {Труды Междунар.\ конф.\ + <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)}, + volume = {1}, + address = {Рига}, + publisher = {ИЭВТ АН Латвии}, + year = {1988}, + pages = {149-153}, + language = {russian}, } @INPROCEEDINGS{Melikov95, - author = "Melikov, A. Z. and Ponomarenko, L. A.", - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {Melikov, A. Z. and Ponomarenko, L. A.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } @INPROCEEDINGS{Gojchuk98, - author="Гойчук, А. Ф.", - title="Особливості етіології і патогенезу поперечного раку - дуба звичайного в Україні", - booktitle="Науковий вісник Національного - аграрного університету", - editor="Мельничука, Д. О. and others", - address="К.", - publisher="НАУ", - year=1998, - series="Вип. 8: Лісівництво", - pages="168--173", - language="ukrainian" + author = {Гойчук, А. Ф.}, + title = {Особливості етіології і патогенезу поперечного раку + дуба звичайного в Україні}, + booktitle = {Науковий вісник Національного + аграрного університету}, + editor = {Мельничука, Д. О. and others}, + address = {К.}, + publisher = {НАУ}, + year = {1998}, + series = {Вип. 8: Лісівництво}, + pages = {168--173}, + language = {ukrainian}, } @INPROCEEDINGS{Polyakov98a, - author="М. О. Поляков", - title="Системний ефект агрегування лісосік в управлінні - лісовими ресурсами на регіональному рівні", - crossref="Gojchuk98", - annote = "Розглянуто ефект агрегування елементарних - господарських одиниць на розмір розрахункової лісосіки. - Запропоновано метод визначення максимально допустимого розміру - рубання за площею на рівні регіону в контексті системи - державного регулювання лісокористування для умов ринкової - економіки", - pages="213--220" -} - - @INPROCEEDINGS{TranskSpivrob99:Purich, - author = "Пурич, Штефан", - title = "{Р}умынско-{У}краинское трансграничное сотрудничество: - проблемы и перспективы", - language = "russian", - booktitle = "Транскордонне співробітництво у поліетнічних регіонах - {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового - симпозіуму", - editor = "Макара, Ю.", - address = "Чернівці", - publisher = "Золоті литаври", - organization = "Буковинський політологічний центр", - year = 1999, - pagetotal = 196, - booklanguage = "ukrainian" -} - @INPROCEEDINGS{Selikov95, - author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {М. О. Поляков}, + title = {Системний ефект агрегування лісосік в управлінні + лісовими ресурсами на регіональному рівні}, + crossref = {Gojchuk98}, + annote = {Розглянуто ефект агрегування елементарних + господарських одиниць на розмір розрахункової лісосіки. + Запропоновано метод визначення максимально допустимого розміру + рубання за площею на рівні регіону в контексті системи + державного регулювання лісокористування для умов ринкової + економіки}, + pages = {213--220}, +} +@INPROCEEDINGS{TranskSpivrob99:Purich, + author = {Пурич, Штефан}, + title = {{Р}умынско-{У}краинское трансграничное сотрудничество: + проблемы и перспективы}, + language = {russian}, + booktitle = {Транскордонне співробітництво у поліетнічних регіонах + {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового + симпозіуму}, + editor = {Макара, Ю.}, + address = {Чернівці}, + publisher = {Золоті литаври}, + organization = {Буковинський політологічний центр}, + year = {1999}, + pagetotal = {196}, + booklanguage = {ukrainian}, +} +@INPROCEEDINGS{Selikov95, + author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } @INPROCEEDINGS{Selikov+95, - author = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515", - language = "russian" + author = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, + language = {russian}, } @PHDTHESIS{Luus82, - author = "Луус, Роман Аркадьевич", - title = "Исследование оборудования с пневмовакуумным - приводом для захвата, перемещения и фиксации - при обработке пористых и легкоповреждаемых - строительных изделий", - type = "Дисссертация на соискание ученой степени кандидата технических наук", - number = "05.05.04", - school = "Моск.\ строит.\ ин-т", - address = "М.", - year = 1982, - pagetotal = 212, - language = "russian" -} -@DSciTHESIS{KIA95-default, - author = "Котельников, Игорь Александрович", - title = "Теория магнитного удержания двухкомпонентной плазмы - в открытых ловушках", - number = "01.04.08", - school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН", - address = "Новосибирск", - year = 1995, - pagetotal = 350, - language = "russian" + author = {Луус, Роман Аркадьевич}, + title = {Исследование оборудования с пневмовакуумным + приводом для захвата, перемещения и фиксации + при обработке пористых и легкоповреждаемых + строительных изделий}, + type = {Диссертация на соискание ученой степени кандидата технических наук}, + number = {05.05.04}, + institution = {Моск.\ строит.\ ин-т}, + address = {М.}, + year = {1982}, + pagetotal = {212}, + language = {russian}, +} +@DOCTHESIS{KIA95-default, + author = {Котельников, Игорь Александрович}, + title = {Теория магнитного удержания двухкомпонентной плазмы + в открытых ловушках}, + number = {01.04.08}, + institution = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН}, + address = {Новосибирск}, + year = {1995}, + pagetotal = {350}, + language = {russian}, +} +@MASTERSTHESIS{mastersthesis-minimal, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + year = {1988}, + institution = {Stanford University}, +} + +@MASTERSTHESIS{mastersthesis-full, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + month = jun, + note = {This is a full MASTERSTHESIS entry}, + type = {Master's project}, + year = {1988}, + address = {English Department}, + institution = {Stanford University}, } @THESIS{KIA85-autoref, - author = "Котельников, Игорь Александрович", - title = "Теория магнитного удержания двухкомпонентной плазмы - в открытых ловушках", - type = "Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук", - number = "01.04.08", - school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН", - address = "Новосибирск", - year = 1995, - pagetotal = 17, - language = "russian" + author = {Котельников, Игорь Александрович}, + title = {Теория магнитного удержания двухкомпонентной плазмы + в открытых ловушках}, + type = {Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук}, + number = {01.04.08}, + school = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН}, + address = {Новосибирск}, + year = {1995}, + pagetotal = {17}, + language = {russian}, +} +@THESIS{vishnyakov:thesis1, + title = {Модели и методы оценки коммерческих банков в условиях неопределенности}, + author = {Вишняков, Илья Владимирович}, + year = {2002}, + date = {2002-02-04}, + langid = {russian}, + language = {russian}, + location = {М.}, + speciality = {экон. наук}, + number = {08.00.13}, + pagetotal = {234}, + titleaddon = {защищена 12.02.02~: утв. 24.06.02}, +} + +@THESIS{vishnyakov:thesis2, + title = {Модели и методы оценки коммерческих банков в условиях неопределенности}, + author = {Вишняков, Илья Владимирович}, + type = {phdthesis}, + addendum = {Библиогр.: с. 220---230.~--- 04200204433}, + _year = {2002}, + date = {2002-02-04}, + langid = {russian}, + language = {russian}, + location = {М.}, + speciality = {экон. наук}, + specialitycode = {08.00.13}, + media = {text}, + pagetotal = {234}, + titleaddon = {защищена 12.02.02~: утв. 24.06.02}, +} + + +@THESIS{Skvortsov:2008, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + author = {Скворцов, Михаил Андреевич}, + type = {docthesis}, + _year = {2008}, + institution = {ИТФ им. Л.\,Д.~Ландау}, + langid = {russian}, + language = {russian}, + location = {Черноголовка}, + speciality = {физ.-мат. наук}, + specialitycode = {01.04.02}, + media = {text}, + pagetotal = {224}, } @BOOK{Ponomarenko76, - author = "Пономаренко, Л. А. and Буадзе, В. В.", - title = "Математические модели и алгоритмы сбора - и обработки информации в АСУТП непрерывных - станов горячей прокатки", - address = "К.", - year = 1976, - pagetotal = 37, - language = "russian", - note = "(Препр./ АН Украины. Ин-т кибернетики; 76-76)" + author = {Пономаренко, Л. А. and Буадзе, В. В.}, + title = {Математические модели и алгоритмы сбора + и обработки информации в АСУТП непрерывных + станов горячей прокатки}, + address = {К.}, + year = {1976}, + pagetotal = {37}, + language = {russian}, + note = {(Препр./ АН Украины. Ин-т кибернетики; 76-76)}, } @REPORT{Report81-rep, - title = {Проведение испытаний и исследований - теплотехнических свойств камер {КХС-2-12-ВЗ} - и {КХС-2-12-КЗІО}}, - institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, - address = "М.", + title = {Проведение испытаний и исследований + теплотехнических свойств камер {КХС-2-12-ВЗ} + и {КХС-2-12-КЗІО}}, + institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, + address = {М.}, organization = {ВИНИТИ}, - year = 1981, - pagetotal = 90, - type = "Отчет о {НИР}", - editor = "Путин, В. В.", - author = "Медведев, Д. А. and others", - note = {Инв.\ № В 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + type = {Отчет о {НИР}}, + editor = {Путин, В. В.}, + author = {Медведев, Д. А. and others}, + note = {Инв.\ № В 119692}, + language = {russian}, } @REPORT{Report81b-rep-notype, - title = {Проведение испытаний и исследований - теплотехнических свойств камер {КХС-2-12-ВЗ} - и {КХС-2-12-КЗІО}}, - institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, - address = "М.", + title = {Проведение испытаний и исследований + теплотехнических свойств камер {КХС-2-12-ВЗ} + и {КХС-2-12-КЗІО}}, + institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, + address = {М.}, organization = {ВИНИТИ}, - year = 1981, - pagetotal = 90, - note = {Инв.\ № В 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + note = {Инв.\ № В 119692}, + language = {russian}, } @TECHREPORT{Report81-techrep, - title = {Проведение испытаний и исследований - теплотехнических свойств камер {КХС-2-12-ВЗ} - и {КХС-2-12-КЗІО}}, - institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, - address = "М.", + title = {Проведение испытаний и исследований + теплотехнических свойств камер {КХС-2-12-ВЗ} + и {КХС-2-12-КЗІО}}, + institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти}, + address = {М.}, organization = {ВИНИТИ}, - year = 1981, - pagetotal = 90, - editor = "Путин, В. В.", - author = "Медведев, Д. А. and others", - note = {Инв.\ № В 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + editor = {Путин, В. В.}, + author = {Медведев, Д. А. and others}, + note = {Инв.\ № В 119692}, + language = {russian}, } @BOOK{CatalogMamals81, - title = {Каталог млекопитающих СССР. - Плиоцен "--- современность}, - organization = "АН СССР, Зоол.\ ин-т", - editor = "И. М. Громова and Г. И. Барановой", - address = "Л.", - publisher = "Наука, Ленинг.\ отд-ние", - year = 1981, - pagetotal = 456, - language = "russian" + title = {Каталог млекопитающих СССР. + Плиоцен "--- современность}, + organization = {АН СССР, Зоол.\ ин-т}, + editor = {И. М. Громова and Г. И. Барановой}, + address = {Л.}, + publisher = {Наука, Ленинг.\ отд-ние}, + year = {1981}, + pagetotal = {456}, + language = {russian}, } - @BOOK{Instr86, - title = "Типовая инструкция по эксплуатации - топливоотдачи тепловых электростанций: - ТИ 34-70-044-85: Утв. Гл. техн. упр. - по эксплуатации энергосистем 01.10.85: - Срок действия установлен с 01.01.86 до 01.01.95", - organization = "М-во энергетики и электрификации СССР", - address = "М.", - year = 1986, - pagetotal = 43, - language = "russian" -} -@online{ wiki:latex, - author = "Wikipedia", - title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia", - year = "2012", - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" + title = {Типовая инструкция по эксплуатации + топливоотдачи тепловых электростанций~: + ТИ 34-70-044-85~: Утв. Гл. техн. упр. + по эксплуатации энергосистем 01.10.85~: + Срок действия установлен с 01.01.86 до 01.01.95}, + organization = {М-во энергетики и электрификации СССР}, + address = {М.}, + year = {1986}, + pagetotal = {43}, + language = {russian}, +} +@ONLINE{wiki:latex, + author = {Wikipedia}, + title = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia}, + year = {2012}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, } -@online{ wiki:latex-2, - author = "Wikipedia", - title = "{\LaTeX}", - howpublished = "Wikipedia, The Free Encyclopedia", - year = "2012", - eprint ="wiki/LaTeX", - eprinttype = {WikiPedia}, - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" -} -@online{ phys:moodle, - author = {Черкасский, В. С.}, - title = {Классная комната}, - howpublished = "Физический факультет", - organization = "НГУ", - year = 2012, - url = {http://www.phys.nsu.ru/moodle/}, - urldate = "16.01.2012", - language = "russian" +@ONLINE{wiki:latex-2, + author = {Wikipedia}, + title = {{\LaTeX}}, + howpublished = {Wikipedia, The Free Encyclopedia}, + year = {2012}, + eprint = {wiki/LaTeX}, + eprinttype = {WikiPedia}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, +} +@ONLINE{phys:moodle, + author = {Черкасский, В. С.}, + title = {Классная комната}, + howpublished = {Физический факультет}, + organization = {НГУ}, + year = {2012}, + url = {http://www.phys.nsu.ru/moodle/}, + urldate = {16.01.2012}, + language = {russian}, } @MISC{EXFOR, author = {IAEA}, @@ -454,112 +521,144 @@ url = {http://www-nds.iaea.org/exfor}, address = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria}, year = {2012}, - medium = {Electronic resource} + media = {eresource} } @BOOK{IsaacNewton, author = {Newton, {\relax Sir Isaac}}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, publisher = {William Innys}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {eresource}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } @BOOK{IsaacNewton-sl:sn, author = {{\relax Sir I}saac Newton}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {online}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } -% publisher = {William Innys}, -@article{PhysRevLett.101.085006, - author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, - volume = {101}, - journal = {Phys. Rev. Lett.}, - month = {Aug}, - pagetotal = {4}, - title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, - year = {2008}, - doi = {10.1103/PhysRevLett.101.085006}, - issue = {8}, - publisher = {American Physical Society}, - pages = {085006} +% publisher = {William Innys}, +@BOOK{Encyclopedia, + title = {Художественная энциклопедия зарубежного классического искусства}, + publisher = {Большая Рос. энцикл.}, + year = {1996}, + address = {М.}, + note = {1 электрон. опт. диск (CD-ROM)}, + language = {russian}, + media = {eresource}, +} + +@ARTICLE{Nasirova, + title = {Модели государственного регулирования страховой деятельности}, + author = {Насырова, Г. А.}, + language = {russian}, + note = {Режим доступа: http://vestnik.fa.ru/4(28)2003/4.html}, + number = {4}, + year = {2003}, + journal = {Вестник Финансовой академии}, + media2 = {eresource}, + media = {online}, +} + +@BOOK{kremlincd, + title = {Московский Кремль}, + titleaddon = {трехмер. путеводитель}, + language = {russian}, + note = {CD-ROM}, + date = {2007}, + location = {М.}, + publisher = {Новый Диск}, + media = {eresource}, +} +@ARTICLE{PhysRevLett.101.085006, + author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, + volume = {101}, + journal = {Phys. Rev. Lett.}, + month = {Aug}, + pagetotal = {4}, + title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, + year = {2008}, + doi = {10.1103/PhysRevLett.101.085006}, + issue = {8}, + publisher = {American Physical Society}, + pages = {085006}, } % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006}, @ARTICLE{1998PhRvE..57.7111K, - author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, - title = "{Turbulent cascades in anisotropic magnetohydrodynamics}", - journal = pre, - keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, - year = 1998, - month = jun, - volume = 57, - pages = {7111-7121}, - doi = {10.1103/PhysRevE.57.7111}, - adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, - adsnote = {Provided by the SAO/NASA Astrophysics Data System} + author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, + title = {{Turbulent cascades in anisotropic magnetohydrodynamics}}, + journal = pre, + keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, + year = {1998}, + month = jun, + volume = {57}, + pages = {7111-7121}, + doi = {10.1103/PhysRevE.57.7111}, + adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System}, } @ARTICLE{1998UFN, - author = {Котельников, И. А. and Астрелин, В. Т.}, - title = "Теория плазменного эмиттера положительных ионов", - journal = ufn, - keywords = {плазменный эмиттер, критерий Бома}, - year = 2015, - month = jul, - volume = 185, - pages = {753-771}, - language = {russian}, - doi = {10.3367/UFNr.0185.201507c.0753}, - url = {http://ufn.ru/ru/articles/2015/7/c/}, + author = {Котельников, И. А. and Астрелин, В. Т.}, + title = {Теория плазменного эмиттера положительных ионов}, + journal = ufn, + keywords = {плазменный эмиттер, критерий Бома}, + year = {2015}, + month = jul, + volume = {185}, + pages = {753-771}, + language = {russian}, + doi = {10.3367/UFNr.0185.201507c.0753}, + url = {http://ufn.ru/ru/articles/2015/7/c/}, } @PATENT{patent1, - author = {Э. В. Тернер}, + author = {Э. В. Тернер}, authorcountry = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, + title = {Одноразовая ракета-носитель}, + media = {text}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, requestnumber = {000108705/28}, - requestdate = {07.04.2000}, + requestdate = {07.04.2000}, publicationdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prioritydate = {09.04.1999}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate= {09.04.1999}, prioritynumber = {09/289, 037}, prioritycountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, + author = {В. И. Чугаева}, authorcountry = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, + title = {Приемопередающее устройство}, + media = {text}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, requestnumber = {000108705/28}, - date = {18.12.2000}, + date = {18.12.2000}, publicationdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty deleted file mode 100644 index 2040b66ca08..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty +++ /dev/null @@ -1,25 +0,0 @@ -\RequirePackage{bibunits} -\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt} -\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0} -\def\@biblabel#1{#1.\hfill} -%\endinput -\renewenvironment{thebibliography}[1] - {\list{\@biblabel{\@arabic\c@enumiv}}% - {\settowidth\labelwidth{\@biblabel{99}}% - \leftmargin\labelwidth - \advance\leftmargin\labelsep -% \advance\leftmargin\parindent - \setcounter{qnuma}{\c@enumiv} - \@openbib@code - \usecounter{enumiv}% - \let\p@enumiv\@empty - \setcounter{enumiv}{\theqnuma} - \renewcommand\theenumiv{\@arabic\c@enumiv}}% - \sloppy - \clubpenalty4000 - \@clubpenalty \clubpenalty - \widowpenalty4000% - \sfcode`\.\@m} - {\def\@noitemerr - {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd deleted file mode 100644 index 9e7cb706150..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd +++ /dev/null @@ -1,21 +0,0 @@ -rename .\bib\examples.bib examples.bak -pause -copy .\bib\ex*.bib .\bib\examples.bib -pause - -for %%f in (ugost7*.tex) do pdflatex -quiet %%f -for %%f in (ugost200*.tex) do pdflatex -quiet %%f - -REM pause -for %%f in (ugost*.aux) do bibtex8 -B -c utf8cyrillic.csf %%f - -REM pause -for %%f in (ugost7*.tex) do pdflatex %%f -for %%f in (ugost200*.tex) do pdflatex %%f -for %%f in (ugost2008-nat*.tex) do pdflatex %%f -for %%f in (ugost2008-sort*.tex) do pdflatex %%f - -del *.aux *.out *.toc *.brf .pdf -del *.bbl -del *.blg -del *.log diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd b/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd deleted file mode 100644 index 3e366cc3307..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd +++ /dev/null @@ -1,13 +0,0 @@ -for %%f in (ugost2008-natbib*.tex) do pdflatex -quiet %%f - -REM pause -for %%f in (ugost2008-natbib*.aux) do bibtex8 -B -c utf8cyrillic.csf %%f - -REM pause -for %%f in (ugost2008-natbib*.tex) do pdflatex %%f -for %%f in (ugost2008-natbib*.tex) do pdflatex %%f - -del *.aux *.out *.toc *.brf .pdf -REM del *.bbl -REM del *.blg -del *.log diff --git a/Master/texmf-dist/doc/bibtex/gost/donat.cmd b/Master/texmf-dist/doc/bibtex/gost/donat.cmd deleted file mode 100644 index 6438edf4364..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/donat.cmd +++ /dev/null @@ -1,13 +0,0 @@ -for %%f in (gost2008-natbib*.tex) do pdflatex -quiet %%f - -REM pause -for %%f in (gost2008-natbib*.aux) do bibtex8 -B -c cp1251.csf %%f - -REM pause -for %%f in (gost2008-natbib*.tex) do pdflatex %%f -for %%f in (gost2008-natbib*.tex) do pdflatex %%f - -del *.aux *.out *.toc *.brf .pdf -REM del *.bbl -REM del *.blg -del *.log diff --git a/Master/texmf-dist/doc/bibtex/gost/ex01.bib b/Master/texmf-dist/doc/bibtex/gost/ex01.bib index f1db3fb698d..57063ef0af7 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex01.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex01.bib @@ -1,9 +1,9 @@ @BOOK{Vasylenko92, - author = ", . .", - title = " : ", - address = ".", - publisher = " ", - year = 1992, - pagetotal = 430, - language = "ukrainian" + author = {, . .}, + title = { : }, + address = {.}, + publisher = { }, + year = {1992}, + pagetotal = {430}, + language = {ukrainian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex02.bib b/Master/texmf-dist/doc/bibtex/gost/ex02.bib index face5aa6c19..28d34ab5e4b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex02.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex02.bib @@ -1,10 +1,10 @@ @BOOK{Afanasyev92, - author = ", . . and , . .", - title = " - ", - address = ".", - publisher = "", - year = 1992, - pagetotal = 190, - language = "russian" + author = {, . . and , . .}, + title = { + }, + address = {.}, + publisher = {}, + year = {1992}, + pagetotal = {190}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex03.bib b/Master/texmf-dist/doc/bibtex/gost/ex03.bib index 07d6f89740c..429a2da7fa0 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex03.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex03.bib @@ -1,11 +1,11 @@ @BOOK{Makilov91, - author = ", . . and , . . - and , . .", - title = " - ", - address = ".", - publisher = "", - year = 1991, - pagetotal = 265, - language = "russian" + author = {, . . and , . . + and , . .}, + title = { + }, + address = {.}, + publisher = {}, + year = {1991}, + pagetotal = {265}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex04.bib b/Master/texmf-dist/doc/bibtex/gost/ex04.bib index afc06386fab..5a838c074cc 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex04.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex04.bib @@ -1,11 +1,11 @@ @BOOK{Ponomarenko86, - title = " ", - author = ". . and . . - and . . and . . ", - editor = ". . ", - address = ".", - publisher = "", - year = 1986, - pagetotal = 144, - language = "russian" + title = { }, + author = {. . and . . + and . . and . . }, + editor = {. . }, + address = {.}, + publisher = {}, + year = {1986}, + pagetotal = {144}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex05.bib b/Master/texmf-dist/doc/bibtex/gost/ex05.bib index 727a544000c..b4acb9dd8ee 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex05.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex05.bib @@ -1,11 +1,11 @@ @BOOK{Belousova81, - title = " - ", - author = ", . . and , . . - and , . . and others", - address = ".", - publisher = "", - year = 1981, - pagetotal = 62, - language = "russian" -}
\ No newline at end of file + title = { + }, + author = {, . . and , . . + and , . . and others}, + address = {.}, + publisher = {}, + year = {1981}, + pagetotal = {62}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex06.bib b/Master/texmf-dist/doc/bibtex/gost/ex06.bib index 49c7ca5aca4..4de1c6bcf7b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex06.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex06.bib @@ -1,12 +1,12 @@ @BOOK{BibOp91, - title = " : - ", - organization = ". . . - . - .~.~. ", - edition = "2-, .", - address = ".", - publisher = ".~", - year = 1991, - pagetotal = 224, - language = "russian" + title = { : + }, + organization = {. . . + . - .~.~. }, + edition = {2-, .}, + address = {.}, + publisher = {.~}, + year = {1991}, + pagetotal = {224}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex06a.bib b/Master/texmf-dist/doc/bibtex/gost/ex06a.bib index 0dc7e82ca35..d595539ba9a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex06a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex06a.bib @@ -1,10 +1,10 @@ @BOOK{Poems82, - title = " . , - , : ", - compiler = ". and . ", - address = ".", - publisher = ". ", - year = 1982, - pagetotal = 224, - language = "russian" + title = { . , + , : }, + compiler = {. and . }, + address = {.}, + publisher = {. }, + year = {1982}, + pagetotal = {224}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex07.bib b/Master/texmf-dist/doc/bibtex/gost/ex07.bib index 076e219931d..8801a77719d 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex07.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex07.bib @@ -1,9 +1,9 @@ @BOOK{HistLit82, - title = " : 4 .", - organization = " , - .~.\ (.)", - address = ".", - year = 1982, - Volume = "3: ", - pagetotal = 876, - language = "russian" -}
\ No newline at end of file + title = { : 4 .}, + organization = { , - .~.\ (.)}, + address = {.}, + year = {1982}, + volume = {3: }, + pagetotal = {876}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex08.bib b/Master/texmf-dist/doc/bibtex/gost/ex08.bib index b4bdb054faf..261cb270893 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex08.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex08.bib @@ -1,10 +1,10 @@ -@Book{Landau:eldin, - author = ". . and . . ", - title = " : 10 .", - publisher = ". .\ .\ .-.\ .", - address = ".", - year = 1992, - volume = "VIII. ", - edition = "3-, .", - language = "russian" +@BOOK{Landau:eldin, + author = {. . and . . }, + title = { : 10 .}, + publisher = {. .\ .\ .-.\ .}, + address = {.}, + year = {1992}, + volume = {VIII. }, + edition = {3-, .}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex09.bib b/Master/texmf-dist/doc/bibtex/gost/ex09.bib index 182f6a51416..cd31d23bec8 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex09.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex09.bib @@ -1,12 +1,12 @@ -@Book{BRLS94, - title = " ii -i - i : 4 .", - organization = ".\ i. I- i.", - address = "i", - publisher = " i i", - year = "1994", - volume = "2: . 1900--1917 .", - editor = ". . and I. . ", - pagetotal = 440, - language = "russian" -}
\ No newline at end of file +@BOOK{BRLS94, + title = { ii -i + i : 4 .}, + organization = {.\ i. I- i.}, + address = {i}, + publisher = { i i}, + year = {1994}, + volume = {2: . 1900--1917 .}, + editor = {. . and I. . }, + pagetotal = {440}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex10.bib b/Master/texmf-dist/doc/bibtex/gost/ex10.bib index dbbbc171c33..5c3f395b641 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex10.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex10.bib @@ -1,9 +1,9 @@ @BOOK{Grosse80, - author = ", . and , .", - title = " : .\ .", - address = ".", - publisher = "", - year = 1980, - pagetotal = 392, - language = "russian" -}
\ No newline at end of file + author = {, . and , .}, + title = { : .\ .}, + address = {.}, + publisher = {}, + year = {1980}, + pagetotal = {392}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex11.bib b/Master/texmf-dist/doc/bibtex/gost/ex11.bib index 7cd572cfa52..4711209121b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex11.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex11.bib @@ -1,11 +1,11 @@ @BOOK{GOST7184, - key = {}, - title = " 7.1.-84. . - . - --- 7.1.-76; . 01.01.86.", - address = ".", - publisher = "- ", - year = 1984, - pagetotal = 78, - language = "russian" -}
\ No newline at end of file + key = {}, + title = { 7.1-84. . + . + --- 7.1-76~; . 01.01.86.}, + address = {.}, + publisher = {- }, + year = {1984}, + pagetotal = {78}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex12.bib b/Master/texmf-dist/doc/bibtex/gost/ex12.bib index 1fcc2ef9be6..ecfc60291b1 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex12.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex12.bib @@ -1,8 +1,8 @@ @BOOK{ObchTech93, - title = " : ...", - address = ".", - publisher = "", - year = 1993, - pagetotal = 99, - language = "ukrainian" -}
\ No newline at end of file + title = { : ...}, + address = {.}, + publisher = {}, + year = {1993}, + pagetotal = {99}, + language = {ukrainian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex13.bib b/Master/texmf-dist/doc/bibtex/gost/ex13.bib index 435b7ea2a44..755ef6661e1 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex13.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex13.bib @@ -1,10 +1,10 @@ @BOOK{Bibdelo86, - title = " : . ", - composer = ". . and . . ", - edition = "2- .", - address = ".", - publisher = "", - year = 1986, - pagetotal = 224, - language = "russian" -}
\ No newline at end of file + title = { : . }, + composer = {. . and . . }, + edition = {2- .}, + address = {.}, + publisher = {}, + year = {1986}, + pagetotal = {224}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex14.bib b/Master/texmf-dist/doc/bibtex/gost/ex14.bib index f5e9e80d9f0..8ded1d318c8 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex14.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex14.bib @@ -1,11 +1,11 @@ @INBOOK{Ponomarenko79, - author = ", . .", - title = " ", - booktitle = " - ", - address = ".", - publisher = "", - year = 1979, - pages = "141-148", - language = "russian" + author = {, . .}, + title = { }, + booktitle = { + }, + address = {.}, + publisher = {}, + year = {1979}, + pages = {141-148}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex14a.bib b/Master/texmf-dist/doc/bibtex/gost/ex14a.bib index 68e1a05afce..13a5a7e4c5a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex14a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex14a.bib @@ -1,11 +1,11 @@ @INBOOK{Zeyts70, - author = ", .", - title = " ", - booktitle = " ", - bookauthor = ", . and , .", - address = ".", - publisher = "", - year = 1970, - pages = "172--186", - language = "russian" + author = {, .}, + title = { }, + booktitle = { }, + bookauthor = {, . and , .}, + address = {.}, + publisher = {}, + year = {1970}, + pages = {172--186}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex15.bib b/Master/texmf-dist/doc/bibtex/gost/ex15.bib index 5707b4367fa..ec178f2f01b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex15.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex15.bib @@ -1,12 +1,12 @@ @INCOLLECTION{Ponoomarenko76, - author = ", . .", - title = " - ", - booktitle = " - ", - address = "", - publisher = " ", - year = 1976, - pages = "3-16", - language = "russian" + author = {, . .}, + title = { + }, + booktitle = { + }, + address = {}, + publisher = { }, + year = {1976}, + pages = {3-16}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex16.bib b/Master/texmf-dist/doc/bibtex/gost/ex16.bib index 68c03582297..8db207bd87a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex16.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex16.bib @@ -1,10 +1,10 @@ -@Article{Malikov92, - author = ", . . and , . .", - title = " - ", - journal = " ", - year = 1992, - number = 6, - pages = "34-38", - language = "russian" +@ARTICLE{Malikov92, + author = {, . . and , . .}, + title = { + }, + journal = { }, + year = {1992}, + number = {6}, + pages = {34-38}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex17.bib b/Master/texmf-dist/doc/bibtex/gost/ex17.bib index 4e2943bfbdc..39e1d292b47 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex17.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex17.bib @@ -1,11 +1,11 @@ -@Article{Ponomarenko86a, - author = ", . . and , . .", - title = " - ", - journal = ".\ .\ . .\ .-.\ .\ ", - year = 1986, - volume = 7, - number = 6, - pages = "79-83", - language = "russian" +@ARTICLE{Ponomarenko86a, + author = {, . . and , . .}, + title = { + }, + journal = {.\ .\ . .\ .-.\ .\ }, + year = {1986}, + volume = {7}, + number = {6}, + pages = {79-83}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex17a.bib b/Master/texmf-dist/doc/bibtex/gost/ex17a.bib index 437c6d138af..5351992600a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex17a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex17a.bib @@ -1,8 +1,8 @@ -@Article{ dixit.pindyck:options, - title = {The Options Approach to Capital Investment}, - author = {Avinash K. Dixit and Robert S. Pindyck}, - journal = {Harvard Business Review}, - year = {1995}, - month = {May-June}, - pages = {105--115} +@ARTICLE{dixit.pindyck:options, + title = {The Options Approach to Capital Investment}, + author = {Avinash K. Dixit and Robert S. Pindyck}, + journal = {Harvard Business Review}, + year = {1995}, + month = {May-June}, + pages = {105--115}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex17b.bib b/Master/texmf-dist/doc/bibtex/gost/ex17b.bib index 361699143f0..4407d93cf37 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex17b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex17b.bib @@ -1,10 +1,10 @@ @ARTICLE{RosGaz-article, - title = " - ", - journal = " ", - year = 1997, - month = "19 ", - pages = 4, - note = " . ", - language = "russian" + title = { + }, + journal = { }, + year = {1997}, + month = {19 }, + pages = {4}, + note = { . }, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex18.bib b/Master/texmf-dist/doc/bibtex/gost/ex18.bib index b0bab735e27..67a509d4972 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex18.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex18.bib @@ -1,11 +1,11 @@ @INBOOK{Dolmatovskiy88, - author = ", . .", - title = "", - booktitle = "", - edition = "3-", - address = ".", - year = 1988, - volume = 30, - pages = 72, - language = "russian" + author = {, . .}, + title = {}, + booktitle = {}, + edition = {3-}, + address = {.}, + year = {1988}, + volume = {30}, + pages = {72}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex19.bib b/Master/texmf-dist/doc/bibtex/gost/ex19.bib index a51d1d2128a..46d45239281 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex19.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex19.bib @@ -1,14 +1,14 @@ @INPROCEEDINGS{Ponomarenko88, - author = ", . . and , . .", - title = " - - ", - booktitle = { .\ .\ - << >> ( 88)}, - volume = 1, - address = "", - publisher = " ", - year = 1988, - pages = "149-153", - language = "russian" + author = {, . . and , . .}, + title = { + + }, + booktitle = { .\ .\ + << >> ( 88)}, + volume = {1}, + address = {}, + publisher = { }, + year = {1988}, + pages = {149-153}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex20.bib b/Master/texmf-dist/doc/bibtex/gost/ex20.bib index 8820824a1ee..59d5fd3c678 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex20.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex20.bib @@ -1,9 +1,9 @@ @INPROCEEDINGS{Melikov95, - author = "Melikov, A. Z. and Ponomarenko, L. A.", - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {Melikov, A. Z. and Ponomarenko, L. A.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex20a.bib b/Master/texmf-dist/doc/bibtex/gost/ex20a.bib index 0185eebe4c4..510df37e95e 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex20a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex20a.bib @@ -1,30 +1,28 @@ @INPROCEEDINGS{Gojchuk98, - author=", . .", - title=" 㳿 - ", - booktitle=" - ", - editor=", . . and others", - address=".", - publisher="", - year=1998, - series=". 8: ˳", - pages="168--173", - language="ukrainian" + author = {, . .}, + title = { 㳿 + }, + booktitle = { + }, + editor = {, . . and others}, + address = {.}, + publisher = {}, + year = {1998}, + series = {. 8: ˳}, + pages = {168--173}, + language = {ukrainian}, } @INPROCEEDINGS{Polyakov98a, - author=". . ", - title=" - ", - crossref="Gojchuk98", - annote = " - . - - - - ", - pages="213--220" + author = {. . }, + title = { + }, + crossref = {Gojchuk98}, + annote = { + . + + + + }, + pages = {213--220}, } - -
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/ex20b.bib b/Master/texmf-dist/doc/bibtex/gost/ex20b.bib index ba1ba1d6bc5..ee783d526df 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex20b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex20b.bib @@ -1,17 +1,16 @@ @INPROCEEDINGS{TranskSpivrob99:Purich, - author = ", ", - title = "{}-{} : - ", - language = "russian", - booktitle = " - {} {}-{} {}: {} - ", - editor = ", .", - address = "", - publisher = " ", - organization = " ", - year = 1999, - pagetotal = 196, - booklanguage = "ukrainian" + author = {, }, + title = {{}-{} : + }, + language = {russian}, + booktitle = { + {} {}-{} {}: {} + }, + editor = {, .}, + address = {}, + publisher = { }, + organization = { }, + year = {1999}, + pagetotal = {196}, + booklanguage = {ukrainian}, } -
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/ex20c.bib b/Master/texmf-dist/doc/bibtex/gost/ex20c.bib index 5a10c2644ad..002f8f4fb41 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex20c.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex20c.bib @@ -1,20 +1,20 @@ @INPROCEEDINGS{Selikov95, - author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } @INPROCEEDINGS{Selikov+95, - author = {, A. Z. and , L. A. and , L. S. and , . .}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515", - language = "russian" + author = {, A. Z. and , L. A. and , L. S. and , . .}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex21.bib b/Master/texmf-dist/doc/bibtex/gost/ex21.bib index ee1a613369e..b3e88b84d27 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex21.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex21.bib @@ -1,14 +1,14 @@ @PHDTHESIS{Luus82, - author = ", ", - title = " - , - - ", - type = " ", - number = "05.05.04", - school = ".\ .\ -", - address = ".", - year = 1982, - pagetotal = 212, - language = "russian" + author = {, }, + title = { + , + + }, + type = { }, + number = {05.05.04}, + institution = {.\ .\ -}, + address = {.}, + year = {1982}, + pagetotal = {212}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex21a.bib b/Master/texmf-dist/doc/bibtex/gost/ex21a.bib index bc027550399..9eefa82a93f 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex21a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex21a.bib @@ -1,11 +1,11 @@ -@DSciTHESIS{KIA95-default, - author = ", ", - title = " - ", - number = "01.04.08", - school = "- .\ .~. ", - address = "", - year = 1995, - pagetotal = 350, - language = "russian" +@DOCTHESIS{KIA95-default, + author = {, }, + title = { + }, + number = {01.04.08}, + institution = {- .\ .~. }, + address = {}, + year = {1995}, + pagetotal = {350}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex21b.bib b/Master/texmf-dist/doc/bibtex/gost/ex21b.bib new file mode 100644 index 00000000000..49be1815053 --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/ex21b.bib @@ -0,0 +1,17 @@ +@MASTERSTHESIS{mastersthesis-minimal, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + year = {1988}, + institution = {Stanford University}, +} + +@MASTERSTHESIS{mastersthesis-full, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + month = jun, + note = {This is a full MASTERSTHESIS entry}, + type = {Master's project}, + year = {1988}, + address = {English Department}, + institution = {Stanford University}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex22.bib b/Master/texmf-dist/doc/bibtex/gost/ex22.bib index bc63d281a49..d2e55c91b32 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex22.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex22.bib @@ -1,12 +1,12 @@ @THESIS{KIA85-autoref, - author = ", ", - title = " - ", - type = ".\ .\ .\ .\ .\ - .-.\ ", - number = "01.04.08", - school = "- .\ .~. ", - address = "", - year = 1995, - pagetotal = 17, - language = "russian" + author = {Котельников, Игорь Александрович}, + title = {Теория магнитного удержания двухкомпонентной плазмы + в открытых ловушках}, + type = {Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук}, + number = {01.04.08}, + school = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН}, + address = {Новосибирск}, + year = {1995}, + pagetotal = {17}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex22a.bib b/Master/texmf-dist/doc/bibtex/gost/ex22a.bib new file mode 100644 index 00000000000..9569e1bb2d5 --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/ex22a.bib @@ -0,0 +1,46 @@ +@THESIS{vishnyakov:thesis1, + title = {Модели и методы оценки коммерческих банков в условиях неопределенности}, + author = {Вишняков, Илья Владимирович}, + year = {2002}, + date = {2002-02-04}, + langid = {russian}, + language = {russian}, + location = {М.}, + speciality = {экон. наук}, + number = {08.00.13}, + pagetotal = {234}, + titleaddon = {защищена 12.02.02~: утв. 24.06.02}, +} + +@THESIS{vishnyakov:thesis2, + title = {Модели и методы оценки коммерческих банков в условиях неопределенности}, + author = {Вишняков, Илья Владимирович}, + type = {phdthesis}, + addendum = {Библиогр.: с. 220---230.~--- 04200204433}, + _year = {2002}, + date = {2002-02-04}, + langid = {russian}, + language = {russian}, + location = {М.}, + speciality = {экон. наук}, + specialitycode = {08.00.13}, + media = {text}, + pagetotal = {234}, + titleaddon = {защищена 12.02.02~: утв. 24.06.02}, +} + + +@THESIS{Skvortsov:2008, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + author = {Скворцов, Михаил Андреевич}, + type = {docthesis}, + _year = {2008}, + institution = {ИТФ им. Л.\,Д.~Ландау}, + langid = {russian}, + language = {russian}, + location = {Черноголовка}, + speciality = {физ.-мат. наук}, + specialitycode = {01.04.02}, + media = {text}, + pagetotal = {224}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex23.bib b/Master/texmf-dist/doc/bibtex/gost/ex23.bib index 601ab1dbbd3..8919d9102ec 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex23.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex23.bib @@ -1,11 +1,11 @@ @BOOK{Ponomarenko76, - author = ", . . and , . .", - title = " - - ", - address = ".", - year = 1976, - pagetotal = 37, - language = "russian", - note = "(./ . - ; 76-76)" + author = {, . . and , . .}, + title = { + + }, + address = {.}, + year = {1976}, + pagetotal = {37}, + language = {russian}, + note = {(./ . - ; 76-76)}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex24.bib b/Master/texmf-dist/doc/bibtex/gost/ex24.bib index f0e95da3c0e..7f94e041da6 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex24.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex24.bib @@ -1,15 +1,15 @@ @REPORT{Report81-rep, - title = { - {-2-12-} - {-2-12-Dz}}, - institution = {.\ .\ - .\ -}, - address = ".", + title = { + {-2-12-} + {-2-12-Dz}}, + institution = {.\ .\ - .\ -}, + address = {.}, organization = {}, - year = 1981, - pagetotal = 90, - type = " {}", - editor = ", . .", - author = ", . . and others", - note = {.\ 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + type = { {}}, + editor = {, . .}, + author = {, . . and others}, + note = {.\ 119692}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex24a.bib b/Master/texmf-dist/doc/bibtex/gost/ex24a.bib index f6cec592c47..4d0612148f6 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex24a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex24a.bib @@ -1,12 +1,12 @@ @REPORT{Report81b-rep-notype, - title = { - {-2-12-} - {-2-12-Dz}}, - institution = {.\ .\ - .\ -}, - address = ".", + title = { + {-2-12-} + {-2-12-Dz}}, + institution = {.\ .\ - .\ -}, + address = {.}, organization = {}, - year = 1981, - pagetotal = 90, - note = {.\ 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + note = {.\ 119692}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex24b.bib b/Master/texmf-dist/doc/bibtex/gost/ex24b.bib index 5a77570ce47..e9377071aa2 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex24b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex24b.bib @@ -1,14 +1,14 @@ @TECHREPORT{Report81-techrep, - title = { - {-2-12-} - {-2-12-Dz}}, - institution = {.\ .\ - .\ -}, - address = ".", + title = { + {-2-12-} + {-2-12-Dz}}, + institution = {.\ .\ - .\ -}, + address = {.}, organization = {}, - year = 1981, - pagetotal = 90, - editor = ", . .", - author = ", . . and others", - note = {.\ 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + editor = {, . .}, + author = {, . . and others}, + note = {.\ 119692}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex25.bib b/Master/texmf-dist/doc/bibtex/gost/ex25.bib index de1d4f64f4d..2e8efb67260 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex25.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex25.bib @@ -1,12 +1,11 @@ @BOOK{CatalogMamals81, - title = { . - "--- }, - organization = " , .\ -", - editor = ". . and . . ", - address = ".", - publisher = ", .\ -", - year = 1981, - pagetotal = 456, - language = "russian" + title = { . + "--- }, + organization = { , .\ -}, + editor = {. . and . . }, + address = {.}, + publisher = {, .\ -}, + year = {1981}, + pagetotal = {456}, + language = {russian}, } - diff --git a/Master/texmf-dist/doc/bibtex/gost/ex26.bib b/Master/texmf-dist/doc/bibtex/gost/ex26.bib index a1e21a8942d..62820b280e3 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex26.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex26.bib @@ -1,12 +1,12 @@ @BOOK{Instr86, - title = " - : - 34-70-044-85: . . . . - 01.10.85: - 01.01.86 01.01.95", - organization = "- ", - address = ".", - year = 1986, - pagetotal = 43, - language = "russian" + title = { + ~: + 34-70-044-85~: . . . . + 01.10.85~: + 01.01.86 01.01.95}, + organization = {- }, + address = {.}, + year = {1986}, + pagetotal = {43}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex27a.bib b/Master/texmf-dist/doc/bibtex/gost/ex27a.bib index 77d355140f4..9b58759802c 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex27a.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex27a.bib @@ -1,18 +1,18 @@ -@online{ wiki:latex, - author = "Wikipedia", - title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia", - year = "2012", - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" +@ONLINE{wiki:latex, + author = {Wikipedia}, + title = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia}, + year = {2012}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, } -@online{ wiki:latex-2, - author = "Wikipedia", - title = "{\LaTeX}", - howpublished = "Wikipedia, The Free Encyclopedia", - year = "2012", - eprint ="wiki/LaTeX", - eprinttype = {WikiPedia}, - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" +@ONLINE{wiki:latex-2, + author = {Wikipedia}, + title = {{\LaTeX}}, + howpublished = {Wikipedia, The Free Encyclopedia}, + year = {2012}, + eprint = {wiki/LaTeX}, + eprinttype = {WikiPedia}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex27b.bib b/Master/texmf-dist/doc/bibtex/gost/ex27b.bib index 76f48ef6bde..d298189634a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex27b.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex27b.bib @@ -1,10 +1,10 @@ -@online{ phys:moodle, - author = {, . .}, - title = { }, - howpublished = " ", - organization = "", - year = 2012, - url = {http://www.phys.nsu.ru/moodle/}, - urldate = "16.01.2012", - language = "russian" +@ONLINE{phys:moodle, + author = {, . .}, + title = { }, + howpublished = { }, + organization = {}, + year = {2012}, + url = {http://www.phys.nsu.ru/moodle/}, + urldate = {16.01.2012}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex27c.bib b/Master/texmf-dist/doc/bibtex/gost/ex27c.bib index 84f1c44976f..35f92171c2a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex27c.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex27c.bib @@ -4,5 +4,5 @@ url = {http://www-nds.iaea.org/exfor}, address = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria}, year = {2012}, - medium = {Electronic resource} + media = {eresource} } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex28.bib b/Master/texmf-dist/doc/bibtex/gost/ex28.bib index f8954251c80..530ca4e2eb8 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex28.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex28.bib @@ -1,25 +1,25 @@ @BOOK{IsaacNewton, author = {Newton, {\relax Sir Isaac}}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, publisher = {William Innys}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {eresource}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } @BOOK{IsaacNewton-sl:sn, author = {{\relax Sir I}saac Newton}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {online}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } -% publisher = {William Innys}, +% publisher = {William Innys}, diff --git a/Master/texmf-dist/doc/bibtex/gost/ex28a.bib b/Master/texmf-dist/doc/bibtex/gost/ex28a.bib new file mode 100644 index 00000000000..856f3848993 --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/ex28a.bib @@ -0,0 +1,32 @@ +@BOOK{Encyclopedia, + title = { }, + publisher = { . .}, + year = {1996}, + address = {.}, + note = {1 . . (CD-ROM)}, + language = {russian}, + media = {eresource}, +} + +@ARTICLE{Nasirova, + title = { }, + author = {, . .}, + language = {russian}, + note = { : http://vestnik.fa.ru/4(28)2003/4.html}, + number = {4}, + year = {2003}, + journal = { }, + media2 = {eresource}, + media = {online}, +} + +@BOOK{kremlincd, + title = { }, + titleaddon = {. }, + language = {russian}, + note = {CD-ROM}, + date = {2007}, + location = {.}, + publisher = { }, + media = {eresource}, +} diff --git a/Master/texmf-dist/doc/bibtex/gost/ex29.bib b/Master/texmf-dist/doc/bibtex/gost/ex29.bib index 4a115383783..416cb5b91c9 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex29.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex29.bib @@ -1,15 +1,15 @@ -@article{PhysRevLett.101.085006, - author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, - volume = {101}, - journal = {Phys. Rev. Lett.}, - month = {Aug}, - pagetotal = {4}, - title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, - year = {2008}, - doi = {10.1103/PhysRevLett.101.085006}, - issue = {8}, - publisher = {American Physical Society}, - pages = {085006} +@ARTICLE{PhysRevLett.101.085006, + author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, + volume = {101}, + journal = {Phys. Rev. Lett.}, + month = {Aug}, + pagetotal = {4}, + title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, + year = {2008}, + doi = {10.1103/PhysRevLett.101.085006}, + issue = {8}, + publisher = {American Physical Society}, + pages = {085006}, } % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006}, diff --git a/Master/texmf-dist/doc/bibtex/gost/ex30.bib b/Master/texmf-dist/doc/bibtex/gost/ex30.bib index e092b5b20d6..836bc7e5add 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex30.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex30.bib @@ -1,27 +1,27 @@ @ARTICLE{1998PhRvE..57.7111K, - author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, - title = "{Turbulent cascades in anisotropic magnetohydrodynamics}", - journal = pre, - keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, - year = 1998, - month = jun, - volume = 57, - pages = {7111-7121}, - doi = {10.1103/PhysRevE.57.7111}, - adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, - adsnote = {Provided by the SAO/NASA Astrophysics Data System} + author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, + title = {{Turbulent cascades in anisotropic magnetohydrodynamics}}, + journal = pre, + keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, + year = {1998}, + month = jun, + volume = {57}, + pages = {7111-7121}, + doi = {10.1103/PhysRevE.57.7111}, + adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System}, } @ARTICLE{1998UFN, - author = {, . . and , . .}, - title = " ", - journal = ufn, - keywords = { , }, - year = 2015, - month = jul, - volume = 185, - pages = {753-771}, - language = {russian}, - doi = {10.3367/UFNr.0185.201507c.0753}, - url = {http://ufn.ru/ru/articles/2015/7/c/}, + author = {, . . and , . .}, + title = { }, + journal = ufn, + keywords = { , }, + year = {2015}, + month = jul, + volume = {185}, + pages = {753-771}, + language = {russian}, + doi = {10.3367/UFNr.0185.201507c.0753}, + url = {http://ufn.ru/ru/articles/2015/7/c/}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/ex31.bib b/Master/texmf-dist/doc/bibtex/gost/ex31.bib index 060b92d9c2c..4ea961f0685 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ex31.bib +++ b/Master/texmf-dist/doc/bibtex/gost/ex31.bib @@ -1,40 +1,40 @@ @PATENT{patent1, - author = {. . }, + author = {. . }, authorcountry = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, + title = { -}, + media = {text}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, requestnumber = {000108705/28}, - requestdate = {07.04.2000}, + requestdate = {07.04.2000}, publicationdate = {10.03.2001}, - publication = {. 7 (I .)}, - prioritydate = {09.04.1999}, + publication = {. 7 (I .)}, + prioritydate= {09.04.1999}, prioritynumber = {09/289, 037}, prioritycountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, + author = {. . }, authorcountry = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, + title = { }, + media = {text}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, requestnumber = {000108705/28}, - date = {18.12.2000}, + date = {18.12.2000}, publicationdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/examples.bib b/Master/texmf-dist/doc/bibtex/gost/examples.bib index 7649c694304..f3c17bdef33 100644 --- a/Master/texmf-dist/doc/bibtex/gost/examples.bib +++ b/Master/texmf-dist/doc/bibtex/gost/examples.bib @@ -1,451 +1,461 @@ @BOOK{Vasylenko92, - author = ", . .", - title = " : ", - address = ".", - publisher = " ", - year = 1992, - pagetotal = 430, - language = "ukrainian" + author = {, . .}, + title = { : }, + address = {.}, + publisher = { }, + year = {1992}, + pagetotal = {430}, + language = {ukrainian}, } @BOOK{Afanasyev92, - author = ", . . and , . .", - title = " - ", - address = ".", - publisher = "", - year = 1992, - pagetotal = 190, - language = "russian" + author = {, . . and , . .}, + title = { + }, + address = {.}, + publisher = {}, + year = {1992}, + pagetotal = {190}, + language = {russian}, } @BOOK{Makilov91, - author = ", . . and , . . - and , . .", - title = " - ", - address = ".", - publisher = "", - year = 1991, - pagetotal = 265, - language = "russian" + author = {, . . and , . . + and , . .}, + title = { + }, + address = {.}, + publisher = {}, + year = {1991}, + pagetotal = {265}, + language = {russian}, } @BOOK{Ponomarenko86, - title = " ", - author = ". . and . . - and . . and . . ", - editor = ". . ", - address = ".", - publisher = "", - year = 1986, - pagetotal = 144, - language = "russian" + title = { }, + author = {. . and . . + and . . and . . }, + editor = {. . }, + address = {.}, + publisher = {}, + year = {1986}, + pagetotal = {144}, + language = {russian}, } @BOOK{Belousova81, - title = " - ", - author = ", . . and , . . - and , . . and others", - address = ".", - publisher = "", - year = 1981, - pagetotal = 62, - language = "russian" -}@BOOK{BibOp91, - title = " : - ", - organization = ". . . - . - .~.~. ", - edition = "2-, .", - address = ".", - publisher = ".~", - year = 1991, - pagetotal = 224, - language = "russian" + title = { + }, + author = {, . . and , . . + and , . . and others}, + address = {.}, + publisher = {}, + year = {1981}, + pagetotal = {62}, + language = {russian}, +} +@BOOK{BibOp91, + title = { : + }, + organization = {. . . + . - .~.~. }, + edition = {2-, .}, + address = {.}, + publisher = {.~}, + year = {1991}, + pagetotal = {224}, + language = {russian}, } @BOOK{Poems82, - title = " . , - , : ", - compiler = ". and . ", - address = ".", - publisher = ". ", - year = 1982, - pagetotal = 224, - language = "russian" + title = { . , + , : }, + compiler = {. and . }, + address = {.}, + publisher = {. }, + year = {1982}, + pagetotal = {224}, + language = {russian}, } @BOOK{HistLit82, - title = " : 4 .", - organization = " , - .~.\ (.)", - address = ".", - year = 1982, - Volume = "3: ", - pagetotal = 876, - language = "russian" -}@Book{Landau:eldin, - author = ". . and . . ", - title = " : 10 .", - publisher = ". .\ .\ .-.\ .", - address = ".", - year = 1992, - volume = "VIII. ", - edition = "3-, .", - language = "russian" -} -@Book{BRLS94, - title = " ii -i - i : 4 .", - organization = ".\ i. I- i.", - address = "i", - publisher = " i i", - year = "1994", - volume = "2: . 1900--1917 .", - editor = ". . and I. . ", - pagetotal = 440, - language = "russian" -}@BOOK{Grosse80, - author = ", . and , .", - title = " : .\ .", - address = ".", - publisher = "", - year = 1980, - pagetotal = 392, - language = "russian" -}@BOOK{GOST7184, - key = {}, - title = " 7.1.-84. . - . - --- 7.1.-76; . 01.01.86.", - address = ".", - publisher = "- ", - year = 1984, - pagetotal = 78, - language = "russian" -}@BOOK{ObchTech93, - title = " : ...", - address = ".", - publisher = "", - year = 1993, - pagetotal = 99, - language = "ukrainian" -}@BOOK{Bibdelo86, - title = " : . ", - composer = ". . and . . ", - edition = "2- .", - address = ".", - publisher = "", - year = 1986, - pagetotal = 224, - language = "russian" -}@INBOOK{Ponomarenko79, - author = ", . .", - title = " ", - booktitle = " - ", - address = ".", - publisher = "", - year = 1979, - pages = "141-148", - language = "russian" + title = { : 4 .}, + organization = { , - .~.\ (.)}, + address = {.}, + year = {1982}, + volume = {3: }, + pagetotal = {876}, + language = {russian}, +} +@BOOK{Landau:eldin, + author = {. . and . . }, + title = { : 10 .}, + publisher = {. .\ .\ .-.\ .}, + address = {.}, + year = {1992}, + volume = {VIII. }, + edition = {3-, .}, + language = {russian}, +} +@BOOK{BRLS94, + title = { ii -i + i : 4 .}, + organization = {.\ i. I- i.}, + address = {i}, + publisher = { i i}, + year = {1994}, + volume = {2: . 1900--1917 .}, + editor = {. . and I. . }, + pagetotal = {440}, + language = {russian}, +} +@BOOK{Grosse80, + author = {, . and , .}, + title = { : .\ .}, + address = {.}, + publisher = {}, + year = {1980}, + pagetotal = {392}, + language = {russian}, +} +@BOOK{GOST7184, + key = {}, + title = { 7.1-84. . + . + --- 7.1-76~; . 01.01.86.}, + address = {.}, + publisher = {- }, + year = {1984}, + pagetotal = {78}, + language = {russian}, +} +@BOOK{ObchTech93, + title = { : ...}, + address = {.}, + publisher = {}, + year = {1993}, + pagetotal = {99}, + language = {ukrainian}, +} +@BOOK{Bibdelo86, + title = { : . }, + composer = {. . and . . }, + edition = {2- .}, + address = {.}, + publisher = {}, + year = {1986}, + pagetotal = {224}, + language = {russian}, +} +@INBOOK{Ponomarenko79, + author = {, . .}, + title = { }, + booktitle = { + }, + address = {.}, + publisher = {}, + year = {1979}, + pages = {141-148}, + language = {russian}, } @INBOOK{Zeyts70, - author = ", .", - title = " ", - booktitle = " ", - bookauthor = ", . and , .", - address = ".", - publisher = "", - year = 1970, - pages = "172--186", - language = "russian" + author = {, .}, + title = { }, + booktitle = { }, + bookauthor = {, . and , .}, + address = {.}, + publisher = {}, + year = {1970}, + pages = {172--186}, + language = {russian}, } @INCOLLECTION{Ponoomarenko76, - author = ", . .", - title = " - ", - booktitle = " - ", - address = "", - publisher = " ", - year = 1976, - pages = "3-16", - language = "russian" -} -@Article{Malikov92, - author = ", . . and , . .", - title = " - ", - journal = " ", - year = 1992, - number = 6, - pages = "34-38", - language = "russian" -} -@Article{Ponomarenko86a, - author = ", . . and , . .", - title = " - ", - journal = ".\ .\ . .\ .-.\ .\ ", - year = 1986, - volume = 7, - number = 6, - pages = "79-83", - language = "russian" -} -@Article{ dixit.pindyck:options, - title = {The Options Approach to Capital Investment}, - author = {Avinash K. Dixit and Robert S. Pindyck}, - journal = {Harvard Business Review}, - year = {1995}, - month = {May-June}, - pages = {105--115} + author = {, . .}, + title = { + }, + booktitle = { + }, + address = {}, + publisher = { }, + year = {1976}, + pages = {3-16}, + language = {russian}, +} +@ARTICLE{Malikov92, + author = {, . . and , . .}, + title = { + }, + journal = { }, + year = {1992}, + number = {6}, + pages = {34-38}, + language = {russian}, +} +@ARTICLE{Ponomarenko86a, + author = {, . . and , . .}, + title = { + }, + journal = {.\ .\ . .\ .-.\ .\ }, + year = {1986}, + volume = {7}, + number = {6}, + pages = {79-83}, + language = {russian}, +} +@ARTICLE{dixit.pindyck:options, + title = {The Options Approach to Capital Investment}, + author = {Avinash K. Dixit and Robert S. Pindyck}, + journal = {Harvard Business Review}, + year = {1995}, + month = {May-June}, + pages = {105--115}, } @ARTICLE{RosGaz-article, - title = " - ", - journal = " ", - year = 1997, - month = "19 ", - pages = 4, - note = " . ", - language = "russian" + title = { + }, + journal = { }, + year = {1997}, + month = {19 }, + pages = {4}, + note = { . }, + language = {russian}, } @INBOOK{Dolmatovskiy88, - author = ", . .", - title = "", - booktitle = "", - edition = "3-", - address = ".", - year = 1988, - volume = 30, - pages = 72, - language = "russian" + author = {, . .}, + title = {}, + booktitle = {}, + edition = {3-}, + address = {.}, + year = {1988}, + volume = {30}, + pages = {72}, + language = {russian}, } @INPROCEEDINGS{Ponomarenko88, - author = ", . . and , . .", - title = " - - ", - booktitle = { .\ .\ - << >> ( 88)}, - volume = 1, - address = "", - publisher = " ", - year = 1988, - pages = "149-153", - language = "russian" + author = {, . . and , . .}, + title = { + + }, + booktitle = { .\ .\ + << >> ( 88)}, + volume = {1}, + address = {}, + publisher = { }, + year = {1988}, + pages = {149-153}, + language = {russian}, } @INPROCEEDINGS{Melikov95, - author = "Melikov, A. Z. and Ponomarenko, L. A.", - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {Melikov, A. Z. and Ponomarenko, L. A.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } @INPROCEEDINGS{Gojchuk98, - author=", . .", - title=" 㳿 - ", - booktitle=" - ", - editor=", . . and others", - address=".", - publisher="", - year=1998, - series=". 8: ˳", - pages="168--173", - language="ukrainian" + author = {, . .}, + title = { 㳿 + }, + booktitle = { + }, + editor = {, . . and others}, + address = {.}, + publisher = {}, + year = {1998}, + series = {. 8: ˳}, + pages = {168--173}, + language = {ukrainian}, } @INPROCEEDINGS{Polyakov98a, - author=". . ", - title=" - ", - crossref="Gojchuk98", - annote = " - . - - - - ", - pages="213--220" -} - - @INPROCEEDINGS{TranskSpivrob99:Purich, - author = ", ", - title = "{}-{} : - ", - language = "russian", - booktitle = " - {} {}-{} {}: {} - ", - editor = ", .", - address = "", - publisher = " ", - organization = " ", - year = 1999, - pagetotal = 196, - booklanguage = "ukrainian" -} - @INPROCEEDINGS{Selikov95, - author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515" + author = {. . }, + title = { + }, + crossref = {Gojchuk98}, + annote = { + . + + + + }, + pages = {213--220}, +} +@INPROCEEDINGS{TranskSpivrob99:Purich, + author = {, }, + title = {{}-{} : + }, + language = {russian}, + booktitle = { + {} {}-{} {}: {} + }, + editor = {, .}, + address = {}, + publisher = { }, + organization = { }, + year = {1999}, + pagetotal = {196}, + booklanguage = {ukrainian}, +} +@INPROCEEDINGS{Selikov95, + author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, } @INPROCEEDINGS{Selikov+95, - author = {, A. Z. and , L. A. and , L. S. and , . .}, - title = "On the approach to optimal control - of queuing systems with multiple classes of customers", - booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.", - address = "Wroclaw (Poland)", - year = 1995, - pages = "507-515", - language = "russian" + author = {, A. Z. and , L. A. and , L. S. and , . .}, + title = {On the approach to optimal control + of queuing systems with multiple classes of customers}, + booktitle = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.}, + address = {Wroclaw (Poland)}, + year = {1995}, + pages = {507-515}, + language = {russian}, } @PHDTHESIS{Luus82, - author = ", ", - title = " - , - - ", - type = " ", - number = "05.05.04", - school = ".\ .\ -", - address = ".", - year = 1982, - pagetotal = 212, - language = "russian" -} -@DSciTHESIS{KIA95-default, - author = ", ", - title = " - ", - number = "01.04.08", - school = "- .\ .~. ", - address = "", - year = 1995, - pagetotal = 350, - language = "russian" -} -@THESIS{KIA85-autoref, - author = ", ", - title = " - ", - type = ".\ .\ .\ .\ .\ - .-.\ ", - number = "01.04.08", - school = "- .\ .~. ", - address = "", - year = 1995, - pagetotal = 17, - language = "russian" + author = {, }, + title = { + , + + }, + type = { }, + number = {05.05.04}, + institution = {.\ .\ -}, + address = {.}, + year = {1982}, + pagetotal = {212}, + language = {russian}, +} +@DOCTHESIS{KIA95-default, + author = {, }, + title = { + }, + number = {01.04.08}, + institution = {- .\ .~. }, + address = {}, + year = {1995}, + pagetotal = {350}, + language = {russian}, +} +@MASTERSTHESIS{mastersthesis-minimal, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + year = {1988}, + institution = {Stanford University}, +} + +@MASTERSTHESIS{mastersthesis-full, + title = {Mastering Thesis Writing}, + author = {{\'{E}}douard Masterly}, + month = jun, + note = {This is a full MASTERSTHESIS entry}, + type = {Master's project}, + year = {1988}, + address = {English Department}, + institution = {Stanford University}, } @BOOK{Ponomarenko76, - author = ", . . and , . .", - title = " - - ", - address = ".", - year = 1976, - pagetotal = 37, - language = "russian", - note = "(./ . - ; 76-76)" + author = {, . . and , . .}, + title = { + + }, + address = {.}, + year = {1976}, + pagetotal = {37}, + language = {russian}, + note = {(./ . - ; 76-76)}, } @REPORT{Report81-rep, - title = { - {-2-12-} - {-2-12-Dz}}, - institution = {.\ .\ - .\ -}, - address = ".", + title = { + {-2-12-} + {-2-12-Dz}}, + institution = {.\ .\ - .\ -}, + address = {.}, organization = {}, - year = 1981, - pagetotal = 90, - type = " {}", - editor = ", . .", - author = ", . . and others", - note = {.\ 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + type = { {}}, + editor = {, . .}, + author = {, . . and others}, + note = {.\ 119692}, + language = {russian}, } @REPORT{Report81b-rep-notype, - title = { - {-2-12-} - {-2-12-Dz}}, - institution = {.\ .\ - .\ -}, - address = ".", + title = { + {-2-12-} + {-2-12-Dz}}, + institution = {.\ .\ - .\ -}, + address = {.}, organization = {}, - year = 1981, - pagetotal = 90, - note = {.\ 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + note = {.\ 119692}, + language = {russian}, } @TECHREPORT{Report81-techrep, - title = { - {-2-12-} - {-2-12-Dz}}, - institution = {.\ .\ - .\ -}, - address = ".", + title = { + {-2-12-} + {-2-12-Dz}}, + institution = {.\ .\ - .\ -}, + address = {.}, organization = {}, - year = 1981, - pagetotal = 90, - editor = ", . .", - author = ", . . and others", - note = {.\ 119692}, - language = "russian" + year = {1981}, + pagetotal = {90}, + editor = {, . .}, + author = {, . . and others}, + note = {.\ 119692}, + language = {russian}, } @BOOK{CatalogMamals81, - title = { . - "--- }, - organization = " , .\ -", - editor = ". . and . . ", - address = ".", - publisher = ", .\ -", - year = 1981, - pagetotal = 456, - language = "russian" + title = { . + "--- }, + organization = { , .\ -}, + editor = {. . and . . }, + address = {.}, + publisher = {, .\ -}, + year = {1981}, + pagetotal = {456}, + language = {russian}, } - @BOOK{Instr86, - title = " - : - 34-70-044-85: . . . . - 01.10.85: - 01.01.86 01.01.95", - organization = "- ", - address = ".", - year = 1986, - pagetotal = 43, - language = "russian" -} -@online{ wiki:latex, - author = "Wikipedia", - title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia", - year = "2012", - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" + title = { + ~: + 34-70-044-85~: . . . . + 01.10.85~: + 01.01.86 01.01.95}, + organization = {- }, + address = {.}, + year = {1986}, + pagetotal = {43}, + language = {russian}, +} +@ONLINE{wiki:latex, + author = {Wikipedia}, + title = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia}, + year = {2012}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, } -@online{ wiki:latex-2, - author = "Wikipedia", - title = "{\LaTeX}", - howpublished = "Wikipedia, The Free Encyclopedia", - year = "2012", - eprint ="wiki/LaTeX", - eprinttype = {WikiPedia}, - url = "http://en.wikipedia.org/wiki/LaTeX", - urldate = "25.01.2012" -} -@online{ phys:moodle, - author = {, . .}, - title = { }, - howpublished = " ", - organization = "", - year = 2012, - url = {http://www.phys.nsu.ru/moodle/}, - urldate = "16.01.2012", - language = "russian" +@ONLINE{wiki:latex-2, + author = {Wikipedia}, + title = {{\LaTeX}}, + howpublished = {Wikipedia, The Free Encyclopedia}, + year = {2012}, + eprint = {wiki/LaTeX}, + eprinttype = {WikiPedia}, + url = {http://en.wikipedia.org/wiki/LaTeX}, + urldate = {25.01.2012}, +} +@ONLINE{phys:moodle, + author = {, . .}, + title = { }, + howpublished = { }, + organization = {}, + year = {2012}, + url = {http://www.phys.nsu.ru/moodle/}, + urldate = {16.01.2012}, + language = {russian}, } @MISC{EXFOR, author = {IAEA}, @@ -453,112 +463,144 @@ url = {http://www-nds.iaea.org/exfor}, address = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria}, year = {2012}, - medium = {Electronic resource} + media = {eresource} } @BOOK{IsaacNewton, author = {Newton, {\relax Sir Isaac}}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, publisher = {William Innys}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {eresource}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } @BOOK{IsaacNewton-sl:sn, author = {{\relax Sir I}saac Newton}, - title = {Opticks, or a treatise of the reflections, + title = {Opticks, or a treatise of the reflections, refractions, inflections and colours of light}, url = {http://books.google.com/books?id=XXu4AkRVBBoC}, - medium = {Electronic resource}, + media = {online}, year = {1730}, - pagetotal = {382}, + pagetotal = {382}, eprint = {XXu4AkRVBBoC}, eprinttype = {Google Books}, } -% publisher = {William Innys}, -@article{PhysRevLett.101.085006, - author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, - volume = {101}, - journal = {Phys. Rev. Lett.}, - month = {Aug}, - pagetotal = {4}, - title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, - year = {2008}, - doi = {10.1103/PhysRevLett.101.085006}, - issue = {8}, - publisher = {American Physical Society}, - pages = {085006} +% publisher = {William Innys}, +@BOOK{Encyclopedia, + title = { }, + publisher = { . .}, + year = {1996}, + address = {.}, + note = {1 . . (CD-ROM)}, + language = {russian}, + media = {eresource}, +} + +@ARTICLE{Nasirova, + title = { }, + author = {, . .}, + language = {russian}, + note = { : http://vestnik.fa.ru/4(28)2003/4.html}, + number = {4}, + year = {2003}, + journal = { }, + media2 = {eresource}, + media = {online}, +} + +@BOOK{kremlincd, + title = { }, + titleaddon = {. }, + language = {russian}, + note = {CD-ROM}, + date = {2007}, + location = {.}, + publisher = { }, + media = {eresource}, +} +@ARTICLE{PhysRevLett.101.085006, + author = {Kotelnikov, Igor and Rom\'e, Massimiliano}, + volume = {101}, + journal = {Phys. Rev. Lett.}, + month = {Aug}, + pagetotal = {4}, + title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap}, + year = {2008}, + doi = {10.1103/PhysRevLett.101.085006}, + issue = {8}, + publisher = {American Physical Society}, + pages = {085006}, } % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006}, @ARTICLE{1998PhRvE..57.7111K, - author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, - title = "{Turbulent cascades in anisotropic magnetohydrodynamics}", - journal = pre, - keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, - year = 1998, - month = jun, - volume = 57, - pages = {7111-7121}, - doi = {10.1103/PhysRevE.57.7111}, - adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, - adsnote = {Provided by the SAO/NASA Astrophysics Data System} + author = {{Kinney}, R.~M. and {McWilliams}, J.~C.}, + title = {{Turbulent cascades in anisotropic magnetohydrodynamics}}, + journal = pre, + keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation}, + year = {1998}, + month = jun, + volume = {57}, + pages = {7111-7121}, + doi = {10.1103/PhysRevE.57.7111}, + adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System}, } @ARTICLE{1998UFN, - author = {, . . and , . .}, - title = " ", - journal = ufn, - keywords = { , }, - year = 2015, - month = jul, - volume = 185, - pages = {753-771}, - language = {russian}, - doi = {10.3367/UFNr.0185.201507c.0753}, - url = {http://ufn.ru/ru/articles/2015/7/c/}, + author = {, . . and , . .}, + title = { }, + journal = ufn, + keywords = { , }, + year = {2015}, + month = jul, + volume = {185}, + pages = {753-771}, + language = {russian}, + doi = {10.3367/UFNr.0185.201507c.0753}, + url = {http://ufn.ru/ru/articles/2015/7/c/}, } @PATENT{patent1, - author = {. . }, + author = {. . }, authorcountry = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, + title = { -}, + media = {text}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, requestnumber = {000108705/28}, - requestdate = {07.04.2000}, + requestdate = {07.04.2000}, publicationdate = {10.03.2001}, - publication = {. 7 (I .)}, - prioritydate = {09.04.1999}, + publication = {. 7 (I .)}, + prioritydate= {09.04.1999}, prioritynumber = {09/289, 037}, prioritycountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, + author = {. . }, authorcountry = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, + title = { }, + media = {text}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, requestnumber = {000108705/28}, - date = {18.12.2000}, + date = {18.12.2000}, publicationdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/bibtex/gost/gost.pdf b/Master/texmf-dist/doc/bibtex/gost/gost.pdf Binary files differindex fc9207f1b02..296cadade9a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost.tex b/Master/texmf-dist/doc/bibtex/gost/gost.tex index ae39d3273d6..71ca5986810 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost.tex +++ b/Master/texmf-dist/doc/bibtex/gost/gost.tex @@ -4,8 +4,38 @@ \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[russian]{babel} -\usepackage{bibunits,verbatim,bibnocap,geometry,ifpdf} -%\usepackage{cmap} +\usepackage{bibunits,verbatim,geometry,ifpdf} + +%============================================================ +\makeatletter +\RequirePackage{bibunits} +\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt} +\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0} +\def\@biblabel#1{#1.\hfill} +%\endinput +\renewenvironment{thebibliography}[1] + {\list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{99}}% + \leftmargin\labelwidth + \advance\leftmargin\labelsep +% \advance\leftmargin\parindent + \setcounter{qnuma}{\c@enumiv} + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \setcounter{enumiv}{\theqnuma} + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy + \clubpenalty4000 + \@clubpenalty \clubpenalty + \widowpenalty4000% + \sfcode`\.\@m} + {\def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist} +\makeatother +%============================================================ + \ifpdf \usepackage[pdftex,hyperindex,unicode]{hyperref} \else @@ -49,80 +79,117 @@ \bibliographystyle{\mybibstyle} \section{Books} + \subsection{One--three authors} \bibentry{ex01} \bibentry{ex02} \bibentry{ex03} + \subsection{Four and more authors} \bibentry{ex04} \bibentry{ex05} + \subsection{Collective author} \bibentry{ex06} + \subsection{Compiler} \bibentry{ex06a} -\subsection{Multiple-volume publication} + +\subsection{Multiple-volume publications} \bibentry{ex07} \bibentry{ex08} \bibentry{ex09} + \subsection{Translated} \bibentry{ex10} + \subsection{Collections} \bibentry{ex12} + \subsection{Dictionary} \bibentry{ex13} -\section{Parts of} + + +\section{Parts of \ldots} + \subsection{Book} \bibentry{ex14} \bibentry{ex14a} + \subsection{Collection} \bibentry{ex15} + \subsection{Journal} \bibentry{ex16} \bibentry{ex17} \bibentry{ex17a} + \subsection{Newspaper} \bibentry{ex17b} -\subsection{Encyclop\ae dia} + +\subsection{Encyclopedia} \bibentry{ex18} + \subsection{Proceedings} \bibentry{ex19} \bibentry{ex20} + \subsubsection{With crossreference} \bibentry{ex20a} + \subsubsection{With multiple languages} \bibentry{ex20b} -\section{Other} + + +\section{Others} + \subsection{Standard} \bibentry{ex11} -\subsection{Ph.D. Thesis / Dissertation} + +\subsection{Dissertation} \bibentry{ex21} \bibentry{ex21a} -\subsection{Synopsis} +\bibentry{ex21b} +Allowed built-in values of \verb|type| field in \verb|@THESIS| entry are \verb|mathesis| for masters thesis, \verb|phdthesis| for Ph.D. thesis, and \verb|docthesis| for doctor of sciences dissertation. Any other value of \verb|type| is reproduced literally. \bibentry{ex22} +\bibentry{ex22a} + \subsection{Preprint} \bibentry{ex23} + \subsection{Report} \bibentry{ex24} \bibentry{ex24a} \bibentry{ex24b} + \subsection{Catalog} \bibentry{ex25} + \subsection{Instruction} \bibentry{ex26} -\section{Electronic Publishing} + +\subsection{Patent} +\bibentry{ex31} + + +\section{Electronic resources} + \subsection{Common Fields} -\verb|Url|, \verb|eprint|, \verb|doi| and \verb|medium| fields can be assigned to any entry. +\verb|Url|, \verb|eprint|, \verb|doi| and \verb|media| fields can be assigned to any entry. Allowed values of \verb|media| are \verb|online|, \verb|eresource| and \verb|text| (default). \bibentry{ex27c} \bibentry{ex28} +\bibentry{ex28a} \bibentry{ex29} + \subsection{Online Entry} \bibentry{ex27a} \bibentry{ex27b} + \section{Use of macros} -\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field + +\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field are automatically translated to Russian or English if necessary. Other languages are not supported. \bibentry{ex30} -\section{Patents} -\bibentry{ex31} + \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2003.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2003.pdf Binary files differindex 944f4a77e1c..ec6e396e081 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2003.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost2003.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-customized.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008-customized.pdf Binary files differindex a181ed31e72..7732e939b6a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-customized.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008-customized.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf Binary files differdeleted file mode 100644 index a9576d3dd16..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf Binary files differdeleted file mode 100644 index 853b34611d4..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex b/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex deleted file mode 100644 index 6f043e5d03f..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex +++ /dev/null @@ -1,106 +0,0 @@ -% !Mode:: "TeX:UTF-8" -\newcommand*{\mybibstyle}{gost2008s} - -\RequirePackage[cp1251]{inputenc} - -\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} -\newcommand{\mydescription}{ - Example of a bibliography using the style \texttt{\mybibstyle.bst}. - No customization is applied. - - - \texttt{\mybibstyle.bst}. - . -} - -\documentclass[a4paper]{article} -\usepackage[cp1251]{inputenc} -\usepackage[T2A]{fontenc} -\usepackage[ukrainian,russian]{babel} -%\usepackage{natbib} -\usepackage{geometry,ifpdf} -\ifpdf - \usepackage[pdftex,hyperindex,unicode]{hyperref} - \usepackage{cmap} -\else - \usepackage[hypertex]{hyperref} -\fi -\usepackage{color} -\definecolor{darkblue}{rgb}{0,0,.6} -\hypersetup{ - pdftitle = {\mytitle}, - pdfauthor = {Igor A. Kotelnikov}, - pdfsubject = {GOST, BibTeX}, - pdfstartview = {FitH}, -% pdfborder = {0 0 0}, -% bookmarksopen = true, - bookmarksnumbered = true, -% bookmarksopenlevel = 2, - colorlinks = true, linkcolor = darkblue, - citecolor = darkblue, filecolor = darkblue, - menucolor = darkblue, urlcolor = darkblue -} - -\makeatletter -\renewcommand{\@biblabel}[1]{#1.} -\makeatother - -\begin{document} - -\title{\mytitle} -\maketitle -\begin{abstract} - \mydescription -\end{abstract} - -\newcommand{\allrefs}{Vasylenko92, -Afanasyev92, -Makilov91, -Ponomarenko86, -Belousova81, -BibOp91, -Poems82, -HistLit82, -Landau:eldin, -BRLS94, -Grosse80, -GOST7184, -ObchTech93, -Bibdelo86, -Ponomarenko79, -Zeyts70, -Ponoomarenko76, -Malikov92, -Ponomarenko86a, -dixit.pindyck:options, -RosGaz-article, -Dolmatovskiy88, -Ponomarenko88, -Melikov95, -Gojchuk98, -Polyakov98a, -TranskSpivrob99:Purich, -Luus82, -KIA95-default, -KIA85-autoref, -Ponomarenko76, -Report81-rep, -Report81b-rep-notype, -Report81-techrep, -CatalogMamals81, -Instr86, -wiki:latex, -wiki:latex-2, -phys:moodle, -EXFOR, -IsaacNewton, -IsaacNewton-sl:sn, -PhysRevLett.101.085006} - -\nocite{*} -\cite{\allrefs} - -\bibliographystyle{\mybibstyle} -\bibliography{bib/examples} - -\end{document} diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf Binary files differindex 8fba81429cb..317bc4d6161 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf Binary files differindex 39f768e5491..c2b666f2159 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf Binary files differnew file mode 100644 index 00000000000..fc7d40fd5af --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.tex b/Master/texmf-dist/doc/bibtex/gost/gost2008n.tex index db27fa6ee14..db27fa6ee14 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.tex +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008n.tex diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.pdf b/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf Binary files differindex 7d0d0407cf6..6349c96af53 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.tex b/Master/texmf-dist/doc/bibtex/gost/gost2008ns.tex index 7b1613b8ff4..7b1613b8ff4 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.tex +++ b/Master/texmf-dist/doc/bibtex/gost/gost2008ns.tex diff --git a/Master/texmf-dist/doc/bibtex/gost/gost780.pdf b/Master/texmf-dist/doc/bibtex/gost/gost780.pdf Binary files differindex 810d6344891..b24f7d2e3d7 100644 --- a/Master/texmf-dist/doc/bibtex/gost/gost780.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/gost780.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd b/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd new file mode 100644 index 00000000000..7fa6c61ce35 --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd @@ -0,0 +1,34 @@ +@echo ⮢ 䠩 ਬ +@echo ========================== + +@echo २ ।饣 饣 䠩 + +rename .\bib\examples.bib examples.bak + +@echo 쪨 䠩 让 + +copy .\bib\ex*.bib .\bib\examples.bib + +@echo ᪠ ਬ + +for %%f in (gost7*.tex) do pdflatex -quiet %%f +for %%f in (gost200*.tex) do pdflatex -quiet %%f + +@echo ᪠ ࠡ⪠ bibtex8 *.aux, ⮣ '㤠 㤥' + +for %%f in (gost*.aux) do bibtex8 -B -c cp1251.csf %%f + +@echo ᪠ ਬ (室 bibtex8) + +for %%f in (gost7*.tex) do pdflatex %%f +for %%f in (gost200*.tex) do pdflatex %%f +for %%f in (gost2008-nat*.tex) do pdflatex %%f +for %%f in (gost2008-sort*.tex) do pdflatex %%f + +@echo ⪠ 㦭 䠩 + +@del *.aux *.out *.toc *.brf .pdf +@del *.bbl +@del *.blg +@del *.log +@echo ======= diff --git a/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd b/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd new file mode 100644 index 00000000000..817e4e38529 --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd @@ -0,0 +1,34 @@ +@echo ⮢ 䠩 ਬ +@echo ========================== + +@echo २ ।饣 饣 䠩 + +rename .\bib\examples.bib examples.bak + +@echo 쪨 䠩 让 + +copy .\bib\ex*.bib .\bib\examples.bib + +@echo ᪠ ਬ + +for %%f in (ugost7*.tex) do pdflatex -quiet %%f +for %%f in (ugost200*.tex) do pdflatex -quiet %%f + +@echo ᪠ ࠡ⪠ bibtex8 *.aux, ⮣ '㤠 㤥' + +for %%f in (ugost*.aux) do bibtex8 -B -c utf8cyrillic.csf %%f + +@echo ᪠ ਬ (室 bibtex8) + +for %%f in (ugost7*.tex) do pdflatex %%f +for %%f in (ugost200*.tex) do pdflatex %%f +for %%f in (ugost2008-nat*.tex) do pdflatex %%f +for %%f in (ugost2008-sort*.tex) do pdflatex %%f + +@echo ⪠ 㦭 䠩 + +@del *.aux *.out *.toc *.brf .pdf +@del *.bbl +@del *.blg +@del *.log +@echo ======= diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost.tex b/Master/texmf-dist/doc/bibtex/gost/ugost.tex index 75650acb64a..27482cbd26b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost.tex @@ -2,7 +2,38 @@ \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[russian]{babel} -\usepackage{bibunits,verbatim,bibnocap,geometry,ifpdf} +\usepackage{bibunits,verbatim,geometry,ifpdf} + +%============================================================ +\makeatletter +\RequirePackage{bibunits} +\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt} +\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0} +\def\@biblabel#1{#1.\hfill} +%\endinput +\renewenvironment{thebibliography}[1] + {\list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{99}}% + \leftmargin\labelwidth + \advance\leftmargin\labelsep +% \advance\leftmargin\parindent + \setcounter{qnuma}{\c@enumiv} + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \setcounter{enumiv}{\theqnuma} + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy + \clubpenalty4000 + \@clubpenalty \clubpenalty + \widowpenalty4000% + \sfcode`\.\@m} + {\def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist} +\makeatother +%============================================================ + \ifpdf \usepackage[pdftex,hyperindex,unicode]{hyperref} \usepackage{cmap} @@ -37,90 +68,127 @@ \end{bibunit} } -\title{\mytitle} -\maketitle -\begin{abstract} - \mydescription -\end{abstract} - +%\title{\mytitle} +%\maketitle +%\begin{abstract} +% \mydescription +%\end{abstract} +% \bibliographyunit[\section] \bibliographystyle{\mybibstyle} \section{Books} + \subsection{One--three authors} \bibentry{ex01} \bibentry{ex02} \bibentry{ex03} + \subsection{Four and more authors} \bibentry{ex04} \bibentry{ex05} + \subsection{Collective author} \bibentry{ex06} + \subsection{Compiler} \bibentry{ex06a} -\subsection{Multiple-volume publication} + +\subsection{Multiple-volume publications} \bibentry{ex07} \bibentry{ex08} \bibentry{ex09} + \subsection{Translated} \bibentry{ex10} + \subsection{Collections} \bibentry{ex12} + \subsection{Dictionary} \bibentry{ex13} -\section{Parts of} + + +\section{Parts of \ldots} + \subsection{Book} \bibentry{ex14} \bibentry{ex14a} + \subsection{Collection} \bibentry{ex15} + \subsection{Journal} \bibentry{ex16} \bibentry{ex17} \bibentry{ex17a} + \subsection{Newspaper} \bibentry{ex17b} -\subsection{Encyclop\ae dia} + +\subsection{Encyclopedia} \bibentry{ex18} + \subsection{Proceedings} \bibentry{ex19} \bibentry{ex20} + \subsubsection{With crossreference} \bibentry{ex20a} + \subsubsection{With multiple languages} \bibentry{ex20b} -\section{Other} + + +\section{Others} + \subsection{Standard} \bibentry{ex11} -\subsection{Ph.D. Thesis / Dissertation} + +\subsection{Dissertation} \bibentry{ex21} \bibentry{ex21a} -\subsection{Synopsis} +\bibentry{ex21b} +Allowed built-in values of \verb|type| field in \verb|@THESIS| entry are \verb|mathesis| for masters thesis, \verb|phdthesis| for Ph.D. thesis, and \verb|docthesis| for doctor of sciences dissertation. Any other value of \verb|type| is reproduced literally. \bibentry{ex22} +\bibentry{ex22a} + \subsection{Preprint} \bibentry{ex23} + \subsection{Report} \bibentry{ex24} \bibentry{ex24a} \bibentry{ex24b} + \subsection{Catalog} \bibentry{ex25} + \subsection{Instruction} \bibentry{ex26} -\section{Electronic Publishing} + +\subsection{Patent} +\bibentry{ex31} + + +\section{Electronic resources} + \subsection{Common Fields} -\verb|Url|, \verb|eprint|, \verb|doi| and \verb|medium| fields can be assigned to any entry. +\verb|Url|, \verb|eprint|, \verb|doi| and \verb|media| fields can be assigned to any entry. Allowed values of \verb|media| are \verb|online|, \verb|eresource| and \verb|text| (default). \bibentry{ex27c} \bibentry{ex28} +\bibentry{ex28a} \bibentry{ex29} + \subsection{Online Entry} \bibentry{ex27a} \bibentry{ex27b} + \section{Use of macros} -\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field + +\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field are automatically translated to Russian or English if necessary. Other languages are not supported. \bibentry{ex30} -\section{Patents} -\bibentry{ex31} + \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf Binary files differindex 1bdf85309e1..63575d6143b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex b/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex index d21e13cd61d..b8c34901b4a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex @@ -1,5 +1,6 @@ \edef\mybibstyle{ugost2003} \RequirePackage[utf8]{inputenc} +\RequirePackage{cmap} \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} \newcommand{\mydescription}{ Example bibliographic description using the style \texttt{\mybibstyle.bst}. diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf Binary files differindex 118e02330a2..e2787ae9a70 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf Binary files differindex 4f641cdbda0..091c78e2b27 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex b/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex index 70935258f58..1044a71e75d 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex @@ -1,5 +1,6 @@ \edef\mybibstyle{ugost2008} \RequirePackage[utf8]{inputenc} +\RequirePackage{cmap} \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} \newcommand{\mydescription}{ Example of a bibliography using the style \texttt{\mybibstyle.bst}. diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf Binary files differindex c3a588cc1d7..de8bc07265e 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex b/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex index 952e20f461f..8d2fdda89f9 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex @@ -1,5 +1,6 @@ \edef\mybibstyle{ugost2008l} \RequirePackage[utf8]{inputenc} +\RequirePackage{cmap} \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} \newcommand{\mydescription}{ Example of a bibliography using the style \texttt{\mybibstyle.bst}. diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf Binary files differindex 5681c64484a..04e9ecefa6e 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.tex b/Master/texmf-dist/doc/bibtex/gost/ugost2008n.tex index ec7e56dbfc6..b11a8624a9b 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008n.tex @@ -2,6 +2,7 @@ \newcommand*{\mybibstyle}{ugost2008n} \RequirePackage[utf8]{inputenc} +\RequirePackage{cmap} \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} \newcommand{\mydescription}{ diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf Binary files differnew file mode 100644 index 00000000000..47eb226140b --- /dev/null +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/gost2008-natbib-s.tex b/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.tex index f0652842e03..7956c2146f8 100644 --- a/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/gost2008-natbib-s.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.tex @@ -1,7 +1,8 @@ % !Mode:: "TeX:UTF-8" -\newcommand*{\mybibstyle}{gost2008ns} +\newcommand*{\mybibstyle}{ugost2008ns} \RequirePackage[utf8]{inputenc} +\RequirePackage{cmap} \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} \newcommand{\mydescription}{ diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf Binary files differindex 3cc95a99a27..739a5db4f6a 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.pdf +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.tex b/Master/texmf-dist/doc/bibtex/gost/ugost2008s.tex index 827e8ccd03c..827e8ccd03c 100644 --- a/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.tex +++ b/Master/texmf-dist/doc/bibtex/gost/ugost2008s.tex diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost780._tex b/Master/texmf-dist/doc/bibtex/gost/ugost780._tex deleted file mode 100644 index 6dd706ee21b..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/ugost780._tex +++ /dev/null @@ -1,16 +0,0 @@ -\edef\mybibstyle{ugost780} -\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst} -\newcommand{\mydescription}{ - Example of a bibliography using the style \texttt{\mybibstyle.bst}. - No customization is applied. - - Пример оформления списка литературы с помощью стиля - \texttt{\mybibstyle.bst} и пакета \texttt{natbib}. - Команды форматирования не изменены. - - Note: this is obsolete style. - - Внимание: данный стиль устарел. - -} -\input ugost
\ No newline at end of file diff --git a/Master/texmf-dist/doc/bibtex/gost/ugost780.pdf b/Master/texmf-dist/doc/bibtex/gost/ugost780.pdf Binary files differdeleted file mode 100644 index fa800c0a943..00000000000 --- a/Master/texmf-dist/doc/bibtex/gost/ugost780.pdf +++ /dev/null diff --git a/Master/texmf-dist/source/bibtex/gost/gost.dtx b/Master/texmf-dist/source/bibtex/gost/gost.dtx index 3fe0b225434..ba678e3abd6 100644 --- a/Master/texmf-dist/source/bibtex/gost/gost.dtx +++ b/Master/texmf-dist/source/bibtex/gost/gost.dtx @@ -7,8 +7,8 @@ % attempt to format the bibliography according to % GOST R 7.0.5-2008 with some conventional modifications. % -% Copyright 2012-2016 Igor A. Kotelnikov. -% Version 1.2g +% Copyright 2012-2017 Igor A. Kotelnikov. +% Version 1.2i % % Copyright 1996-2005 Maksym Polyakov. % Version 2005.08.12 @@ -35,11 +35,12 @@ % To unpack run % latex gost.ins % -% To produce documentation run +% To produce the documentation run % pdflatex gost.dtx % makeindex -r -s gind.ist gost % makeindex -r -s gglo.ist -o gost.gls gost.glo % pdflatex gost.dtx +% pdflatex gost.dtx % % TeX Directory Structure % @@ -48,11 +49,11 @@ % Move all *.pdf files to TDS:doc/bibtex/gost % Move gost.dtx and gost.ins to TDS:source/bibtex/gost/ % -% $Id: gost.dtx, v.2012/08/31 kia999 $ +% $Id: gost.dtx, v.2017/01/12 kia999 $ % %<*driver> \ProvidesFile{gost.dtx}% - [2016/09/21 v.1.2h Bibliography styles for GOST R 7.0.5-2008.] + [2017/01/12 v.1.2i Bibliography styles for GOST R 7.0.5-2008.] \documentclass{ltxdoc} @@ -62,7 +63,8 @@ \usepackage[pdftex,hyperindex,unicode]{hyperref} \usepackage{cmap} \else - \usepackage[hypertex]{hyperref} + %\usepackage[hypertex]{hyperref} + \usepackage{hyperref} \fi \usepackage{color} \definecolor{darkblue}{rgb}{0,0,.6} @@ -126,44 +128,29 @@ %</driver> % \fi % -% \CheckSum{548} -% -% \changes{v1.2h}{21 Sep 2016}{minor changes in documentation} -% \changes{v1.2g}{25 Jul 2016}{minor changes in documentation} -% \changes{v1.2f}{12 Jul 2016}{patent entry added} -% \changes{v1.2e}{07 Jul 2016}{bbl.url added to replace URL string} -% \changes{v1.2d}{18 Feb 2016}{\cs{bbljan} e.t.c. macros removed} -% \changes{v1.2c}{18 Jan 2015}{langid field added} -% \changes{v1.2c}{18 Jan 2015}{eid field added} -% \changes{v1.2c}{17 Jan 2015}{fix Gost2003: "--- replaced by \cs{BibDash}} -% \changes{v1.2b}{19 Jan 2014}{numpages renamed to pagetotal} -% \changes{v1.2a}{31 Aug 2012}{Default for \cs{cyrdash} added} -% \changes{v1.2}{20 Feb 2012}{Support for natbib package} -% \changes{v1.2}{13 Feb 2012}{Fix bbl.urldate for ukrainian (Andrey Shvajkoy)} -% \changes{v1.2}{02 Feb 2012}{Thesis entry, report entry} -% \changes{v1.2}{01 Feb 2012}{Medium field} -% \changes{v1.2}{30 Jan 2012}{Strict option} -% \changes{v1.2}{29 Jan 2012}{Refactoring, Documentation} -% \changes{v1.2}{26 Jan 2012}{Entries eprint, eprintclass, eprinttype} -% \changes{v1.2}{26 Jan 2012}{Options modern, long, eprint} -% \changes{v1.1}{25 Jan 2012}{Gost705.dtx borrowed from Disser pkg} -% \changes{v1.1}{21 Jan 2012}{Upload to CTAN} -% \changes{v1.1}{15 Jan 2012}{Added German, French, Italian languages} -% \changes{v1.1}{15 Jan 2012}{Entry ONLINE} -% \changes{v1.0}{12 Aug 2005}{Bug fix (long annote)} -% \changes{v0.9}{07 Oct 2003}{Bug fix in names and date formatting} -% \changes{v0.9}{07 Oct 2003}{Bug fix in INPROCEEDINGS} -% \changes{v0.8}{10 Aug 2003}{\cs{BibEmph} added} -% \changes{v0.8}{06 Jun 2003}{Entry ANNOTE added} -% \changes{v0.8}{06 Jun 2003}{\cs{BibUrl} added} -% \changes{v0.8}{06 Jun 2003}{\cs{BibAnnote} added} +% \CheckSum{592} % % \DoNotIndex{\cyra,\cyrb,\cyrv,\cyrg,\cyrd,\cyre} % \DoNotIndex{\CYRP,\cyrii,\cyrr,\cyre,\cyro,\CYRU,\cyrk,\cyrl,\CYRS,\cyrs|} % \DoNotIndex{\cyrt,\cyri,\cyrz,\CYRT,\cyrm} % \DoNotIndex{\cyr,\cyrc,\CYRD,\cyrery,\cyrh,\CYRK,\CYRM,\CYRN,\cyrn} % \DoNotIndex{\cyrp,\cyrs,\cyrshch,\cyru,\CYRV,\cyrya} +% \DoNotIndex{\CYRA,\CYRB,\cyrch,\CYRE,\CYREREV,\CYRF,\cyrf,\CYRI,\cyrishrt} +% \DoNotIndex{\CYRO,\CYRR,\cyrsftsn,\CYRYA,\cyryu,\cyrzh} % \DoNotIndex{\z@skip,\z@} +% \DoNotIndex{\|,\~,\ } +% \DoNotIndex{\\&,\',\(,\),\`,\\,\/,\.} +% \DoNotIndex{\begin,\DeclareUTFcharacter} +% \DoNotIndex{\csname,\def} +% \DoNotIndex{\else,\endcsname,\end} +% \DoNotIndex{\expandafter,\fi} +% \DoNotIndex{\hbox,\hss} +% \DoNotIndex{\iffalse,\ifx,\ignorespaces,\iflanguage} +% \DoNotIndex{\language,\lastskip,\ldots,\let,\natexlab,\newblock,\nobreak} +% \DoNotIndex{\providecommand,\ProvideTextCommandDefault,\relax,\renewcommand} +% \DoNotIndex{\selectlanguage,\selectlanguageifdefined,\small,\textemdash} +% \DoNotIndex{\textnumero,\unskip,\url,\UTFencname} +% \DoNotIndex{\,,\catcode,\cite,\citeauthor,\citet,\citeyear,\href,\hskip,\ifdim} % % \begin{abstract} % @@ -432,7 +419,36 @@ % \end{enumerate} % % -% \subsection{What's new in version 1.2h (2016.08.21)} +% \subsection{Version history} +% +% \subsubsection*{Version 1.2i (2017.01.12)} +% +% \begin{enumerate} +% \item +% Documentation and examples update (thanks to Leonid Sinev). +% +% \item +% Restored |@MastersThesis| instead of |@MasterThesis| (thanks to Leonid Sinev). +% +% \item +% |media="eresource"| is introduced in addition to |media="online"| and +% |media="text"|; if present, the |media| field is not ignored any more in +% modern bst-styles compiled without the |strict| option. +% +% \item +% |location| field is introduced as an alias of |address| field. +% +% \item +% |@DSCISTHESIS| entry renamed to |@DOCTHESIS|. +% +% \item +% |school| field in |@THESIS| and similar entries is replaced by +% |institution| to comply with |biblatex-gost| style. +% +% \end{enumerate} +% +% +% \subsubsection*{Version 1.2h (2016.08.21)} % % \begin{enumerate} % \item @@ -441,7 +457,7 @@ % \end{enumerate} % % -% \subsection{What's new in version 1.2g (2016.07.25)} +% \subsubsection*{Version 1.2g (2016.07.25)} % % \begin{enumerate} % \item @@ -450,18 +466,18 @@ % \end{enumerate} % % -% \subsection{What's new in version 1.2f (2016.07.12)} +% \subsubsection*{Version 1.2f (2016.07.12)} % % \begin{enumerate} % \item % Support for patent entry added (thanks to Stanislav Kruchinin). % % \item -% medium field renamed to media field. +% |medium| field renamed to |media| field for compatibility with biblatex. % \end{enumerate} % -% \subsection{What's new in version 1.2e (2016.07.07)} +% \subsubsection*{Version 1.2e (2016.07.07)} % % \begin{enumerate} % \item @@ -470,17 +486,17 @@ % % \end{enumerate} % -% \subsection{What's new in version 1.2d (2015.02.18)} +% \subsubsection*{Version 1.2d (2015.02.18)} % % \begin{enumerate} % \item -% jan, feb, e.t.c. macros fixed. +% jan, feb, etc. macros fixed. % % \item % New macro format.month. % \end{enumerate} % -% \subsection{What's new in version 1.2c (2015.01.10)} +% \subsubsection*{Version 1.2c (2015.01.10)} % % \begin{enumerate} % \item @@ -500,7 +516,7 @@ % Spacing around |\BibDash| has been improved. % % \item -% |\BibDash| now typesets short em-dash (|\cyrdahs|) only for |russian| and +% |\BibDash| now typesets short em-dash (|\cyrdash|) only for |russian| and % |ukrainian| languages. In earlier versions, it produces short em-dash for % all languages. % @@ -508,7 +524,7 @@ % % \end{enumerate} % -% \subsection{What's new in version 1.2a (2012.08.31)} +% \subsubsection*{Version 1.2a (2012.08.31)} % % \begin{enumerate} % @@ -518,14 +534,14 @@ % % \end{enumerate} % -% \subsection{What's new in version 1.2 (2012.02.22)} +% \subsubsection*{Version 1.2 (2012.02.22)} % % \begin{enumerate} % \item % Code refactoring. All styles are now generated from single source file. % % \item -% Support for GOST-7.1-2003. The field |medium| is added to reflect type +% Support for GOST 7.1-2003. The field |medium| is added to reflect type % of material. For most entry types |medium| defaults to |text|. % % \item @@ -537,7 +553,7 @@ % \end{enumerate} % % -% \subsection{What's new in version 1.1 (2012.01.21)} +% \subsubsection*{Version 1.1 (2012.01.21)} % % \begin{enumerate} % \item @@ -553,13 +569,13 @@ % \item % |@DSciThesis| entry is added to format a reference to doctor of % sciences thesis. - +% % \item % |Urldate|, |eprint|, |eprintclass|, |eprinttype| fields are added. % % \end{enumerate} % -% \subsection{Version history} +% \subsubsection{Older versions} % % \begin{enumerate} % \item[2012.02.22] Support for |natbib| package. @@ -574,6 +590,7 @@ % entry is described; numbers in black roman refer to the code lines where % the entry is used. % } +% \GlossaryPrologue{\section{Change History}} % \PrintChanges % \PrintIndex % } @@ -590,7 +607,7 @@ %<*bst> %% %% This bibstyle attempts to format bibliography according to -%<!modern>%% GOST 7.80-2000 for bibliographic records. +%<!modern>%% GOST 7.1-2003 for bibliographic records. %<modern>%% GOST 7.0.5-2008 for bibliographic reference. %<*natbib>%% %%------------------------------------------------------------------- @@ -626,6 +643,11 @@ % % Enlist all entry types allowed in a bibliographic database. % Most entries are common for many standard bst styles. +% \changes{v1.2f}{12 Jul 2016}{entry \texttt{patent} added} +% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{langid} added} +% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{eid} added} +% \changes{v1.2}{01 Feb 2012}{entry field \texttt{medium} added} +% \changes{v0.8}{06 Jun 2003}{entry field \texttt{annote} added} % \begin{macrocode} ENTRY { address @@ -641,50 +663,52 @@ 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 % \end{macrocode} % Entries borrowed from biblatex. +% \changes{v1.2b}{19 Jan 2014}{entry field \texttt{numpages} renamed to \texttt{pagetotal}} +% \changes{v1.2}{26 Jan 2012}{entry fields \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype} added} % \begin{macrocode} - date % new in v1.2f; not implemented yet... + %date % not implemented yet... pagetotal url urldate isbn doi -% archive - eprinttype % = archivePrefix - eprintclass % = primaryClass + eprinttype % = archivePrefix + eprintclass % = primaryClass eprint -% \end{macrocode} -% Entries borrowed from disser.bst by S.Kruchinin. -% \begin{macrocode} % 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 @@ -746,6 +770,9 @@ FUNCTION {change.language} % % Declare functions to output various parts of bibliographic record. % \DescribeFunction{output.nonnull} +% Function |output.nonnull| writes to output buffer the last literal in the stack +% assuming that it is not empty and adds an appropriate punctuation symbol. +% \changes{v1.2c}{17 Jan 2015}{fix Gost2003: \texttt{"}\texttt{-}\texttt{-}\texttt{-} replaced by macro \cs{BibDash}} % \begin{macrocode} FUNCTION {output.nonnull} { @@ -790,6 +817,10 @@ FUNCTION {output.nonnull} % \end{macrocode} % % \DescribeFunction{output} +% Function |output| calls |output.nonnul| is the last literal string in the stack +% if it is not empty; otherwise it discards the literal. +% Function |output.check| do the same but also warns if the indicated field is +% empty. % \DescribeFunction{output.check} % \begin{macrocode} FUNCTION {output} @@ -998,6 +1029,7 @@ FUNCTION {new.sentence.checkb} % \end{macrocode} % \DescribeFunction{new.dblslash.checka} % For |online| entry. +% \changes{v1.1}{15 Jan 2012}{entry type \texttt{@online} added} % \begin{macrocode} FUNCTION {new.dblslash.checka} { empty$ @@ -1020,6 +1052,7 @@ FUNCTION {field.or.null} % % \DescribeFunction{emphasize} % Declare function to emphasize last string in stack. +% \changes{v0.8}{10 Aug 2003}{macro \cs{BibEmph} added} % \begin{macrocode} FUNCTION {emphasize} { duplicate$ empty$ @@ -1436,6 +1469,7 @@ if$} % \end{macrocode} % Next function was added in version 2016.07.07. % \DescribeFunction{bbl.url} +% \changes{v1.2e}{07 Jul 2016}{\texttt{bbl.url} added to replace URL string} % \begin{macrocode} FUNCTION {bbl.url} { curlanguage "english" = @@ -1456,6 +1490,7 @@ if$} % \end{macrocode} % Next function was added in version 2012.01.15. % \DescribeFunction{bbl.urldate} +% \changes{v1.2}{13 Feb 2012}{fix \texttt{bbl.urldate} for ukrainian (Andrey Shvajkoy)} % \begin{macrocode} FUNCTION {bbl.urldate} { curlanguage "english" = @@ -1491,9 +1526,9 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport if$} % \end{macrocode} -% \DescribeFunction{bbl.mthesis} +% \DescribeFunction{bbl.mathesis} % \begin{macrocode} -FUNCTION {bbl.mthesis} +FUNCTION {bbl.mathesis} { curlanguage "english" = { "Master's thesis" } { curlanguage "german" = @@ -1510,6 +1545,7 @@ if$} % \end{macrocode} % \DescribeFunction{bbl.phdthesis} +% \changes{v1.2i}{04 Jan 2017}{corrected bbl.phdthesis and bbl.docthesis to comply GOST} % \begin{macrocode} FUNCTION {bbl.phdthesis} { curlanguage "english" = @@ -1517,9 +1553,9 @@ FUNCTION {bbl.phdthesis} { curlanguage "german" = { "Diss.~Ph.\,D." } { curlanguage "russian" = -%<!utf8> { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri" -%<!utf8> "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * } -%<utf8> { "{Дисс\ldots\ кандидата наук}" } +%<!utf8> { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. " +%<!utf8> "\cyrn\cyra\cyru\cyrk}" * } +%<utf8> { "{дис.\ \ldots\ канд. наук}" } { curlanguage "french" = { "Th\`{e}se de doctorat" } { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" } @@ -1529,23 +1565,40 @@ FUNCTION {bbl.phdthesis} if$} % \end{macrocode} -% \DescribeFunction{bbl.dscithesis} +% \DescribeFunction{bbl.docthesis} % \begin{macrocode} -FUNCTION {bbl.dscithesis} +FUNCTION {bbl.docthesis} { curlanguage "english" = { "Dr.\,Sci. dissertation" } { curlanguage "german" = { "Diss.~Dr." } { curlanguage "russian" = -%<!utf8> { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro" -%<!utf8> "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * } -%<utf8> { "{Дисс\ldots\ доктора наук}" } - { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" } +%<!utf8> { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ " +%<!utf8> "\cyrn\cyra\cyru\cyrk}" * } +%<utf8> { "{дис.\ \ldots\ д-ра наук}" } + { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" } if$} if$} if$} % \end{macrocode} +% \DescribeFunction{bbl.thesis.type`} +% \begin{macrocode} +FUNCTION {bbl.thesis.type} +{ type "mathesis" = + { bbl.mathesis } + { type "phdthesis" = + { bbl.phdthesis } + { type "docthesis" = + { bbl.docthesis } + %%{ "!!!" type * "t" change.case$ } +%<!utf8> { type "t" change.case$ } +%<utf8> { type } + if$} + if$} +if$} + +% \end{macrocode} % \DescribeFunction{bbl.nnoaddress} % \begin{macrocode} FUNCTION {bbl.nnoaddress} @@ -1598,16 +1651,18 @@ FUNCTION {bbl.media.text} if$} % \end{macrocode} -% \DescribeFunction{bbl.media.elres} +% \DescribeFunction{bbl.media.eresource} % \begin{macrocode} -FUNCTION {bbl.media.elres} +FUNCTION {bbl.media.eresource} { curlanguage "english" = { "Electronic resource" } { curlanguage "russian" = -%<!utf8> { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" } +%<!utf8> { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ " +%<!utf8> "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * } %<utf8> { "{Электронный ресурс}" } { curlanguage "ukrainian" = -%<!utf8> { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" } +%<!utf8> { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ " +%<!utf8> "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * } %<utf8> { "{Електронний ресурс}" } { "language is not defined: " language "media" * * warning$ "Electronic resource" } if$} @@ -1615,6 +1670,26 @@ FUNCTION {bbl.media.elres} if$} % \end{macrocode} +% \DescribeFunction{bbl.media.online} +% \changes{v1.2i}{02 Jan 2017}{\texttt{media} field normalised} +% \begin{macrocode} +FUNCTION {bbl.media.online} +{ curlanguage "english" = + { "Electronic resource online" } + { curlanguage "russian" = +%<!utf8> { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ " +%<!utf8> "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * } +%<utf8> { "{Электронный ресурс онлайн}" } + { curlanguage "ukrainian" = +%<!utf8> { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ " +%<!utf8> "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * } +%<utf8> { "{Електронний ресурс онлайн}" } + { "language is not defined: " language "media" * * warning$ "Electronic resource" } + if$} + if$} +if$} + +% \end{macrocode} % \DescribeFunction{bbl.chief} % \begin{macrocode} FUNCTION {bbl.chief} @@ -1651,10 +1726,18 @@ if$} % \end{macrocode} % \DescribeFunction{bbl.media} % \begin{macrocode} +%FUNCTION {bbl.media} +%{ type$ "online" = +% { bbl.media.eresource } +% { bbl.media.text } +%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$} % \end{macrocode} @@ -2081,6 +2164,7 @@ FUNCTION {format.title} % \DescribeFunction{format.month} % New in version 1.2d. This macro reads month field and translate English names % of months to Russian if current language is Russian. +% \changes{v1.2i}{29 Dec 2016}{typo fix in \texttt{format.month}} % \begin{macrocode} FUNCTION {format.month} { month empty$ @@ -2111,7 +2195,7 @@ FUNCTION {format.month} %<!utf8> { "\CYRA\cyrv\cyrg\." } %<utf8> { "Авг." } { month "Sep." = -%<!utf8> { "\CYRS\cyre\cyn\cyrt." } +%<!utf8> { "\CYRS\cyre\cyrn\cyrt." } %<utf8> { "Сент." } { month "Oct." = %<!utf8> { "\CYRO\cyrk\cyrt." } @@ -2130,6 +2214,7 @@ FUNCTION {format.month} } % \end{macrocode} % \DescribeFunction{format.date} +% \changes{v1.2c}{17 Jan 2015}{fix Gost2003: \texttt{"}\texttt{-}\texttt{-}\texttt{-} replaced by macro \cs{BibDash}} % \begin{macrocode} FUNCTION {format.date} { year empty$ @@ -2150,15 +2235,82 @@ FUNCTION {format.date} } % \end{macrocode} +% \DescribeFunction{address.or.location} +% New function in version 1.2i. Returns |address| value if not empty; otherwise +% returns |location| value even if the latter is empty. +% \changes{v1.2i}{02 Jan 2017}{\texttt{location} field added as alias to \texttt{address} field} +% \begin{macrocode} +%FUNCTION {address.or.location} +%{ +% address empty$ +% { location empty$ +% 'skip$ +% { location } +% if$ } +% { address } +% if$ +%} +FUNCTION {address.or.location} +{ + address empty$ + { location } + { address } + if$ +} + +% \end{macrocode} +% +% \DescribeFunction{specialitycode.or.number} +% New function in version 1.2i. Returns |specialitycode| value if not empty; otherwise +% returns |number| value even if the latter is empty. +% \changes{v1.2i}{13 Jan 2017}{\texttt{number} field is now alias to \texttt{specialitycode}} +% \begin{macrocode} +FUNCTION {specialitycode.or.number} +{ + specialitycode empty$ + { number } + { specialitycode } + if$ +} + +% \end{macrocode} +% +% \DescribeFunction{institution.or.school} +% New function in version 1.2i. Returns |institution| value if not empty; otherwise +% returns |school| value even if the latter is empty. +% \changes{v1.2i}{13 Jan 2017}{\texttt{school} field is now alias to \texttt{instituttion}} +% \begin{macrocode} +FUNCTION {institution.or.school} +{ + institution empty$ + { school} + { institution } + if$ +} +% \end{macrocode} +% % \DescribeFunction{format.address.publisher} % \DescribeFunction{format.address.publisher.date} % \begin{macrocode} %<*!strict> +%FUNCTION {output.address.publisher} +%{ +% address empty$ +% 'skip$ +% { address output +% publisher empty$ +% 'skip$ +% { new.colon } +% if$ +% } +% if$ +% publisher output +%} FUNCTION {output.address.publisher} { - address empty$ + address empty$ location empty$ and 'skip$ - { address output + { address.or.location output publisher empty$ 'skip$ { new.colon } @@ -2208,6 +2360,7 @@ FUNCTION {output.address.publisher.date} % \end{macrocode} % \DescribeFunction{output.bibitem} +% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{langid} added} % \begin{macrocode} %<*!natbib> FUNCTION {output.bibitem} @@ -2621,6 +2774,7 @@ FUNCTION {multi.page.check} % \end{macrocode} % \DescribeFunction{format.pages} +% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{eid} added} % \begin{macrocode} %%FUNCTION {format.pages} %%{ pages empty$ @@ -2654,6 +2808,8 @@ FUNCTION {format.pages} % \end{macrocode} % \DescribeFunction{format.pages.page} +% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{eid} added} +% \changes{v1.2b}{19 Jan 2014}{entry field \texttt{numpages} renamed to \texttt{pagetotal}} % \begin{macrocode} %%FUNCTION {format.pages.page} %%{ pages empty$ @@ -2761,16 +2917,23 @@ FUNCTION {empty.misc.check} % \end{macrocode} % \DescribeFunction{format.thesis.type} % \begin{macrocode} +%FUNCTION {format.thesis.type} +%{ type empty$ +% 'skip$ +% { pop$ +%%<!utf8> bbl.thesis.type "t" change.case$ +%%<utf8> bbl.thesis.type +% } +% if$ +%} FUNCTION {format.thesis.type} { type empty$ 'skip$ { pop$ -%<!utf8> type "t" change.case$ -%<utf8> type + bbl.thesis.type } if$ } - % \end{macrocode} % \DescribeFunction{format.techrep.type.number} % Function to format report type and number. @@ -2953,6 +3116,7 @@ FUNCTION {editor.organization.after} % \end{macrocode} % \DescribeFunction{format.url} +% \changes{v0.8}{06 Jun 2003}{macro \cs{BibUrl} added} % \begin{macrocode} FUNCTION {format.url} { url empty$ @@ -2981,6 +3145,7 @@ FUNCTION {output.url} % \end{macrocode} % \DescribeFunction{format.annote} +% \changes{v0.8}{06 Jun 2003}{macro \cs{BibAnnote} added} % \begin{macrocode} FUNCTION {format.annote} { annote empty$ @@ -3039,20 +3204,30 @@ FUNCTION {add.doi} { } % \end{macrocode} % \DescribeFunction{add.media} -% New in version 2. Adds media field if |strict| options is in effect. +% New in version 1.2. Adds |media| field if |strict| options is in effect. +% If the |media| field is empty |add.media| prints a value based on the |type| +% field. If the |type| is also empty |add.media| prints equivalent of the +% word |text| in current language. % \begin{macrocode} %<*!strict> -FUNCTION {add.media} { } +FUNCTION {add.media} +{ duplicate$ empty$ + 'skip$ + { media empty$ + 'skip$ + { " " * bbl.media enclose.square.brackets * } + if$ + } + if$ +} %</!strict> %<*strict> 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$ @@ -3085,6 +3260,7 @@ FUNCTION {add.media} % Also see eprinttype and eprintclass. % % This function should use url. TO BE DONE YET. +% \changes{v1.2}{26 Jan 2012}{entry fields \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype}} % \begin{macrocode} %<*eprint> %FUNCTION {format.eprint} @@ -3163,6 +3339,7 @@ FUNCTION {output.eprint.url} % % Functions added in v1.2f to format patent entry (thanks to Stanislav Kruchinin). % +% \changes{v1.2f}{12 Jul 2016}{entry field \texttt{patent} added} % \DescribeFunction{add.number} % \begin{macrocode} FUNCTION {add.number} @@ -3353,7 +3530,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 @@ -3484,16 +3661,6 @@ FUNCTION {proceedings} new.block format.bvolume output format.number.series output -% address empty$ -% { publisher output -% format.date "year" output.check -% } -% { address output.nonnull -% format.date "year" output.check -% new.sentence -% publisher output -% } -% if$ output.address.publisher format.date "year" output.check new.block @@ -3517,6 +3684,7 @@ FUNCTION {proceedings} % venue, language, volume, part, volumes, series, number, note, organization, % publisher, location, month, isbn, chapter, pages, addendum, pubstate, doi, % eprint, eprintclass, eprinttype, url, urldate. +% \changes{v0.9}{07 Oct 2003}{bug fix in \texttt{@inproceedings} entry type} % \begin{macrocode} FUNCTION {inproceedings} { output.bibitem @@ -3634,7 +3802,7 @@ FUNCTION {patent} new.colon format.type.number output add.blank - location output + address.or.location output new.colon ipc output new.slash @@ -3736,6 +3904,7 @@ FUNCTION {unpublished} % % Optional fields: subtitle, titleaddon, language, version, note, % organization, date, month, year, addendum, pubstate, urldate. +% \changes{v1.1}{15 Jan 2012}{Entry type \texttt{@online} added} % \begin{macrocode} FUNCTION {online} { output.bibitem @@ -3787,6 +3956,7 @@ FUNCTION {electronic} {online} % chapter, pages, pagetotal, addendum, pubstate, doi, eprint, eprintclass, % eprinttype, url, urldate % +% \changes{v1.2}{02 Feb 2012}{\texttt{@thesis} entry} % \begin{macrocode} %<*!(modern|strict)> FUNCTION {thesis} @@ -3798,7 +3968,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 @@ -3818,14 +3989,18 @@ FUNCTION {thesis} new.sentence format.btitle add.doi add.media "title" output.check new.colon -% bbl.phdthesis format.thesis.type output.nonnull - 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 @@ -3855,6 +4030,7 @@ FUNCTION {thesis} % Optional fields: subtitle, titleaddon, language, number, version, note, % location, month, isrn, chapter, pages, pagetotal, addendum, pubstate, doi, % eprint, eprintclass, eprinttype, url, urldate. +% \changes{v1.2}{02 Feb 2012}{\texttt{@report} entry} % \begin{macrocode} %FUNCTION {report} %{ @@ -3898,13 +4074,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 @@ -3940,7 +4117,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 @@ -3962,11 +4140,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 @@ -3986,18 +4168,20 @@ FUNCTION {phdthesis} % \DescribeFunction{mastersthesis} % Similar to |@thesis| except that the type field is optional and defaults to the localized % term `Master's thesis'. You may still use the type field to override that. +% \changes{v1.2i}{29 Dec 2016}{entry \texttt{@MastersThesis} added again (see v1.1)} % \begin{macrocode} %<*!(modern|strict)> -FUNCTION {masterthesis} +FUNCTION {mastersthesis} { output.bibitem format.authors "author" output.check %<natbib> author format.key output 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 @@ -4010,20 +4194,24 @@ FUNCTION {masterthesis} } %</!(modern|strict)> %<*modern|strict> -FUNCTION {masterthesis} +FUNCTION {mastersthesis} { output.bibitem format.authors "author" output.check %<natbib> 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 @@ -4040,21 +4228,23 @@ FUNCTION {masterthesis} %</modern|strict> % \end{macrocode} -% \DescribeFunction{dscithesis} +% \DescribeFunction{docthesis} % Similar to |@thesis| except that the type field is optional and defaults to the localized % term `Doctor's of sciences thesis'. You may still use the type field to override that. +% \changes{v1.2i}{02 Jan 2017}{\texttt{@dscithesis} entry renamed to \texttt{@docthesis}} % \begin{macrocode} %<*!(modern|strict)> -FUNCTION {dscithesis} +FUNCTION {docthesis} { output.bibitem format.authors "author" output.check %<natbib> author format.key output 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 @@ -4067,20 +4257,24 @@ FUNCTION {dscithesis} } %</!(modern|strict)> %<*modern|strict> -FUNCTION {dscithesis} +FUNCTION {docthesis} { output.bibitem format.authors "author" output.check %<natbib> 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 @@ -4151,13 +4345,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 @@ -4171,7 +4366,6 @@ FUNCTION {techreport} fin.entry } - % \end{macrocode} % \DescribeFunction{default.type} % \begin{macrocode} @@ -4184,6 +4378,7 @@ FUNCTION {default.type} { misc } % backward compatibility with standard .bst styles which are designed for English. % The string in the definition of any month macro must coincide with that used in % |format.month| function in the above. +% \changes{v1.2d}{18 Feb 2016}{\cs{bbljan} etc. macros removed} % \begin{macrocode} MACRO {jan} {"Jan."} MACRO {feb} {"Feb."} @@ -4836,6 +5031,10 @@ SORT % \DescribeFunction{begin.bib} % Within |thebibliography| environment we define few formatting macros % for user to customize how the reference list is formatted. +% \changes{v1.2a}{31 Aug 2012}{default for \cs{cyrdash} added} +% \changes{v0.8}{06 Jun 2003}{macro \cs{BibAnnote} added} +% \changes{v0.8}{06 Jun 2003}{macro \cs{BibUrl} added} +% \changes{v0.8}{10 Aug 2003}{macro \cs{BibEmph} added} % \begin{macrocode} FUNCTION {begin.bib} { "\begin{thebibliography}{" longest.label * "}" * write$ newline$ diff --git a/Master/texmf-dist/source/bibtex/gost/gost.ins b/Master/texmf-dist/source/bibtex/gost/gost.ins index 564da8dc708..e7a41aeab8b 100644 --- a/Master/texmf-dist/source/bibtex/gost/gost.ins +++ b/Master/texmf-dist/source/bibtex/gost/gost.ins @@ -1,4 +1,4 @@ -\input docstrip + \input docstrip \keepsilent @@ -15,7 +15,7 @@ version 2005/12/01 or later. 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> diff --git a/Master/texmf-dist/tex/latex/gost/bibnocap.sty b/Master/texmf-dist/tex/latex/gost/bibnocap.sty deleted file mode 100644 index 2040b66ca08..00000000000 --- a/Master/texmf-dist/tex/latex/gost/bibnocap.sty +++ /dev/null @@ -1,25 +0,0 @@ -\RequirePackage{bibunits} -\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt} -\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0} -\def\@biblabel#1{#1.\hfill} -%\endinput -\renewenvironment{thebibliography}[1] - {\list{\@biblabel{\@arabic\c@enumiv}}% - {\settowidth\labelwidth{\@biblabel{99}}% - \leftmargin\labelwidth - \advance\leftmargin\labelsep -% \advance\leftmargin\parindent - \setcounter{qnuma}{\c@enumiv} - \@openbib@code - \usecounter{enumiv}% - \let\p@enumiv\@empty - \setcounter{enumiv}{\theqnuma} - \renewcommand\theenumiv{\@arabic\c@enumiv}}% - \sloppy - \clubpenalty4000 - \@clubpenalty \clubpenalty - \widowpenalty4000% - \sfcode`\.\@m} - {\def\@noitemerr - {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} |