texlive[41778] Master/texmf-dist: gost (26jul16)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 31 01:13:21 CEST 2016
Revision: 41778
http://tug.org/svn/texlive?view=revision&revision=41778
Author: karl
Date: 2016-07-31 01:13:20 +0200 (Sun, 31 Jul 2016)
Log Message:
-----------
gost (26jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst
trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
trunk/Master/texmf-dist/doc/bibtex/gost/README
trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib
trunk/Master/texmf-dist/doc/bibtex/gost/gost.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2003.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-customized.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/gost780.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf
trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf
trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx
trunk/Master/texmf-dist/source/bibtex/gost/gost.ins
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/bibtex/gost/gost2008e.goodbst
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.80-2000 for bibliographic records.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -110,7 +133,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,13 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets}
-{ duplicate$ empty$
- { pop$ "" }
- { "[" swap$ * "]" * }
- if$
-}
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -303,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -572,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -669,16 +703,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -685,7 +719,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -709,17 +743,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -875,7 +957,7 @@
}
{ month empty$
'year
- { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -893,7 +975,7 @@
}
{
address output
- new.column
+ new.colon
publisher empty$
{ bbl.nopublisher enclose.square.brackets }
{ publisher }
@@ -905,20 +987,6 @@
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1251,7 +1319,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1260,7 +1328,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1269,19 +1337,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1290,7 +1358,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1299,6 +1367,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1329,14 +1405,14 @@
if$
}
-FUNCTION {add.medium}
+FUNCTION {add.media}
{ duplicate$ empty$
'skip$
- { medium empty$
- { " " * bbl.medium enclose.square.brackets * }
- { " " * medium enclose.square.brackets * }
-%% { bbl.medium enclose.square.brackets * }
-%% { medium enclose.square.brackets * }
+ { media empty$
+ { " " * bbl.media enclose.square.brackets * }
+ { " " * media enclose.square.brackets * }
+%% { bbl.media enclose.square.brackets * }
+%% { media enclose.square.brackets * }
if$
}
if$
@@ -1373,11 +1449,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1401,7 +1518,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1430,7 +1547,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1450,7 +1567,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1484,7 +1601,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1510,7 +1627,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1530,7 +1647,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1566,7 +1683,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1592,11 +1709,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1630,7 +1786,7 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
howpublished enclose.square.brackets output
editor.organization.after
@@ -1654,14 +1810,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1681,20 +1837,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1711,14 +1867,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1737,14 +1893,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1763,14 +1919,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1792,20 +1948,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.80-2000 for bibliographic records.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -110,7 +133,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,13 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets}
-{ duplicate$ empty$
- { pop$ "" }
- { "[" swap$ * "]" * }
- if$
-}
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -313,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -582,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -679,16 +713,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -695,7 +729,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -719,17 +753,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -885,7 +967,7 @@
}
{ month empty$
'year
- { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -903,7 +985,7 @@
}
{
address output
- new.column
+ new.colon
publisher empty$
{ bbl.nopublisher enclose.square.brackets }
{ publisher }
@@ -915,20 +997,6 @@
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1261,7 +1329,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1270,7 +1338,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1279,19 +1347,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1300,7 +1368,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1309,6 +1377,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1339,14 +1415,14 @@
if$
}
-FUNCTION {add.medium}
+FUNCTION {add.media}
{ duplicate$ empty$
'skip$
- { medium empty$
- { " " * bbl.medium enclose.square.brackets * }
- { " " * medium enclose.square.brackets * }
-%% { bbl.medium enclose.square.brackets * }
-%% { medium enclose.square.brackets * }
+ { media empty$
+ { " " * bbl.media enclose.square.brackets * }
+ { " " * media enclose.square.brackets * }
+%% { bbl.media enclose.square.brackets * }
+%% { media enclose.square.brackets * }
if$
}
if$
@@ -1383,11 +1459,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1411,7 +1528,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1440,7 +1557,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1460,7 +1577,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1494,7 +1611,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1520,7 +1637,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1540,7 +1657,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1576,7 +1693,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1602,11 +1719,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1640,7 +1796,7 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
howpublished enclose.square.brackets output
editor.organization.after
@@ -1664,14 +1820,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1691,20 +1847,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1721,14 +1877,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1747,14 +1903,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1773,14 +1929,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1802,20 +1958,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,8 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -298,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -567,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -664,16 +703,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -680,7 +719,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -704,17 +743,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -913,7 +1000,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -921,20 +1008,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1268,7 +1341,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1279,7 +1352,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1288,19 +1361,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1309,7 +1382,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1318,6 +1391,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1348,7 +1429,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1381,11 +1462,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1409,7 +1531,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1438,7 +1560,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1458,7 +1580,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1492,7 +1614,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1518,7 +1640,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1538,7 +1660,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1574,7 +1696,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1600,11 +1722,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1638,9 +1799,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1662,14 +1823,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1689,20 +1850,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1719,14 +1880,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1745,14 +1906,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1771,14 +1932,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1800,20 +1961,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,8 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -298,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -567,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -664,16 +703,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -680,7 +719,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -704,17 +743,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -913,7 +1000,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -921,20 +1008,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1267,7 +1340,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1276,19 +1349,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1297,7 +1370,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1306,6 +1379,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1336,7 +1417,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1369,11 +1450,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1397,7 +1519,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1426,7 +1548,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1446,7 +1568,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1480,7 +1602,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1506,7 +1628,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1526,7 +1648,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1562,7 +1684,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1588,11 +1710,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1626,9 +1787,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1650,14 +1811,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1677,20 +1838,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1707,14 +1868,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1733,14 +1894,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1759,14 +1920,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1788,20 +1949,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,8 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -308,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -577,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -674,16 +713,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -690,7 +729,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -714,17 +753,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -923,7 +1010,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -931,20 +1018,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1277,7 +1350,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1286,19 +1359,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1307,7 +1380,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1316,6 +1389,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1346,7 +1427,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1379,11 +1460,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1407,7 +1529,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1436,7 +1558,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1456,7 +1578,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1490,7 +1612,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1516,7 +1638,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1536,7 +1658,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1572,7 +1694,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1598,11 +1720,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1636,9 +1797,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1660,14 +1821,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1687,20 +1848,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1717,14 +1878,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1743,14 +1904,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1769,14 +1930,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1798,20 +1959,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -81,7 +82,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -88,6 +90,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -96,12 +99,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label extra.label sort.label short.list }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -110,8 +133,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -146,9 +169,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -209,17 +232,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -326,8 +349,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -334,15 +355,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -617,6 +642,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -714,16 +753,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -730,7 +769,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -754,17 +793,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -1083,7 +1170,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -1517,7 +1604,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1528,7 +1615,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1537,19 +1624,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1558,7 +1645,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1567,6 +1654,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1597,7 +1692,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1630,12 +1725,53 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
author format.key output
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1660,7 +1796,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1690,7 +1826,7 @@
output.bibitem
author.before
author format.key output
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1711,7 +1847,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1746,7 +1882,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1773,7 +1909,7 @@
{
output.bibitem
editor format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1794,7 +1930,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1831,7 +1967,7 @@
if$
author format.key output
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1857,12 +1993,52 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ author format.key output
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1898,9 +2074,9 @@
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1923,14 +2099,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1950,21 +2126,21 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1982,14 +2158,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2009,14 +2185,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2036,14 +2212,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2065,21 +2241,21 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -81,7 +82,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -88,6 +90,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -96,12 +99,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label extra.label sort.label short.list }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -110,8 +133,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -146,9 +169,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -209,17 +232,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -326,8 +349,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -334,15 +355,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -617,6 +642,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -714,16 +753,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -730,7 +769,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -754,17 +793,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -1083,7 +1170,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -1517,7 +1604,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1528,7 +1615,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1537,19 +1624,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1558,7 +1645,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1567,6 +1654,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1597,7 +1692,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1630,12 +1725,53 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
author format.key output
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1660,7 +1796,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1690,7 +1826,7 @@
output.bibitem
author.before
author format.key output
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1711,7 +1847,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1746,7 +1882,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1773,7 +1909,7 @@
{
output.bibitem
editor format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1794,7 +1930,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1831,7 +1967,7 @@
if$
author format.key output
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1857,12 +1993,52 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ author format.key output
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1898,9 +2074,9 @@
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1923,14 +2099,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1950,21 +2126,21 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1982,14 +2158,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2009,14 +2185,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2036,14 +2212,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2065,21 +2241,21 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,8 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -308,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -577,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -674,16 +713,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -690,7 +729,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -714,17 +753,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -923,7 +1010,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -931,20 +1018,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1278,7 +1351,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1289,7 +1362,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1298,19 +1371,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1319,7 +1392,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1328,6 +1401,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1358,7 +1439,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1391,11 +1472,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1419,7 +1541,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1448,7 +1570,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1468,7 +1590,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1502,7 +1624,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1528,7 +1650,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1548,7 +1670,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1584,7 +1706,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1610,11 +1732,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1648,9 +1809,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1672,14 +1833,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1699,20 +1860,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1729,14 +1890,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1755,14 +1916,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1781,14 +1942,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1810,20 +1971,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.80-2000 for bibliographic records.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -110,7 +133,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ ": " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,8 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -298,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -567,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -664,16 +703,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -680,7 +719,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -704,17 +743,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -870,7 +957,7 @@
}
{ month empty$
'year
- { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -883,7 +970,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -896,20 +983,6 @@
format.date output
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1242,7 +1315,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1251,7 +1324,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1260,19 +1333,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1290,6 +1363,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1311,7 +1392,7 @@
FUNCTION {add.doi} { }
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
FUNCTION {output.eprint.url}
@@ -1319,11 +1400,52 @@
format.url output
}
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1347,7 +1469,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1374,7 +1496,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1394,7 +1516,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1426,7 +1548,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1452,7 +1574,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1472,7 +1594,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1508,7 +1630,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1534,11 +1656,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1572,9 +1733,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1597,7 +1758,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1617,20 +1778,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1648,7 +1809,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1668,7 +1829,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1688,7 +1849,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1710,20 +1871,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.80-2000 for bibliographic records.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -110,7 +133,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ ": " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,8 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -308,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -577,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+ { curlanguage "russian" =
+ { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -674,16 +713,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -690,7 +729,7 @@
{ "{\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 "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -714,17 +753,65 @@
{ "{\cyr\cyri\cyrs\cyrp\cyro\cyrl\cyrn.}" }
{ curlanguage "ukrainian" =
{ "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -880,7 +967,7 @@
}
{ month empty$
'year
- { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -893,7 +980,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -906,20 +993,6 @@
format.date output
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1252,7 +1325,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1261,7 +1334,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1270,19 +1343,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1300,6 +1373,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1321,7 +1402,7 @@
FUNCTION {add.doi} { }
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
FUNCTION {output.eprint.url}
@@ -1329,11 +1410,52 @@
format.url output
}
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1357,7 +1479,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1384,7 +1506,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1404,7 +1526,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1436,7 +1558,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1462,7 +1584,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1482,7 +1604,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1518,7 +1640,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1544,11 +1666,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1582,9 +1743,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1607,7 +1768,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1627,20 +1788,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1658,7 +1819,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1678,7 +1839,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1698,7 +1859,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -1720,20 +1881,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.80-2000 for bibliographic records.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -110,7 +133,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,13 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets}
-{ duplicate$ empty$
- { pop$ "" }
- { "[" swap$ * "]" * }
- if$
-}
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -303,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -572,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -665,16 +699,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -681,7 +715,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -705,17 +739,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -870,7 +952,7 @@
}
{ month empty$
'year
- { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -888,7 +970,7 @@
}
{
address output
- new.column
+ new.colon
publisher empty$
{ bbl.nopublisher enclose.square.brackets }
{ publisher }
@@ -900,20 +982,6 @@
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1246,7 +1314,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1255,7 +1323,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1264,19 +1332,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1285,7 +1353,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1294,6 +1362,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1324,14 +1400,14 @@
if$
}
-FUNCTION {add.medium}
+FUNCTION {add.media}
{ duplicate$ empty$
'skip$
- { medium empty$
- { " " * bbl.medium enclose.square.brackets * }
- { " " * medium enclose.square.brackets * }
-%% { bbl.medium enclose.square.brackets * }
-%% { medium enclose.square.brackets * }
+ { media empty$
+ { " " * bbl.media enclose.square.brackets * }
+ { " " * media enclose.square.brackets * }
+%% { bbl.media enclose.square.brackets * }
+%% { media enclose.square.brackets * }
if$
}
if$
@@ -1368,11 +1444,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1396,7 +1513,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1425,7 +1542,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1445,7 +1562,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1479,7 +1596,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1505,7 +1622,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1525,7 +1642,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1561,7 +1678,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1587,11 +1704,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1625,7 +1781,7 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
howpublished enclose.square.brackets output
editor.organization.after
@@ -1649,14 +1805,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1676,20 +1832,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1706,14 +1862,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1732,14 +1888,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1758,14 +1914,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1787,20 +1943,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.80-2000 for bibliographic records.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -110,7 +133,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,13 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets}
-{ duplicate$ empty$
- { pop$ "" }
- { "[" swap$ * "]" * }
- if$
-}
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -313,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -582,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -675,16 +709,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -691,7 +725,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -715,17 +749,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -880,7 +962,7 @@
}
{ month empty$
'year
- { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -898,7 +980,7 @@
}
{
address output
- new.column
+ new.colon
publisher empty$
{ bbl.nopublisher enclose.square.brackets }
{ publisher }
@@ -910,20 +992,6 @@
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1256,7 +1324,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1265,7 +1333,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1274,19 +1342,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1295,7 +1363,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1304,6 +1372,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1334,14 +1410,14 @@
if$
}
-FUNCTION {add.medium}
+FUNCTION {add.media}
{ duplicate$ empty$
'skip$
- { medium empty$
- { " " * bbl.medium enclose.square.brackets * }
- { " " * medium enclose.square.brackets * }
-%% { bbl.medium enclose.square.brackets * }
-%% { medium enclose.square.brackets * }
+ { media empty$
+ { " " * bbl.media enclose.square.brackets * }
+ { " " * media enclose.square.brackets * }
+%% { bbl.media enclose.square.brackets * }
+%% { media enclose.square.brackets * }
if$
}
if$
@@ -1378,11 +1454,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1406,7 +1523,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1435,7 +1552,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1455,7 +1572,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1489,7 +1606,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1515,7 +1632,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1535,7 +1652,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1571,7 +1688,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1597,11 +1714,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1635,7 +1791,7 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
howpublished enclose.square.brackets output
editor.organization.after
@@ -1659,14 +1815,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1686,20 +1842,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1716,14 +1872,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1742,14 +1898,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1768,14 +1924,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1797,20 +1953,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,8 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -298,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -567,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -660,16 +699,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -676,7 +715,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -700,17 +739,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -908,7 +995,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -916,20 +1003,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1263,7 +1336,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1274,7 +1347,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1283,19 +1356,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1304,7 +1377,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1313,6 +1386,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1343,7 +1424,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1376,11 +1457,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1404,7 +1526,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1433,7 +1555,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1453,7 +1575,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1487,7 +1609,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1513,7 +1635,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1533,7 +1655,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1569,7 +1691,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1595,11 +1717,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1633,9 +1794,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1657,14 +1818,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1684,20 +1845,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1714,14 +1875,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1740,14 +1901,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1766,14 +1927,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1795,20 +1956,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -290,8 +313,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -298,15 +319,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -567,6 +592,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -660,16 +699,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -676,7 +715,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -700,17 +739,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -908,7 +995,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -916,20 +1003,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1262,7 +1335,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1271,19 +1344,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1292,7 +1365,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1301,6 +1374,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1331,7 +1412,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1364,11 +1445,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1392,7 +1514,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1421,7 +1543,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1441,7 +1563,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1475,7 +1597,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1501,7 +1623,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1521,7 +1643,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1557,7 +1679,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1583,11 +1705,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1621,9 +1782,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1645,14 +1806,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1672,20 +1833,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1702,14 +1863,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1728,14 +1889,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1754,14 +1915,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1783,20 +1944,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,8 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -308,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -577,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -670,16 +709,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -686,7 +725,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -710,17 +749,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -918,7 +1005,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -926,20 +1013,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1273,7 +1346,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1284,7 +1357,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1293,19 +1366,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1314,7 +1387,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1323,6 +1396,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1353,7 +1434,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1386,11 +1467,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1414,7 +1536,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1443,7 +1565,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1463,7 +1585,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1497,7 +1619,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1523,7 +1645,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1543,7 +1665,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1579,7 +1701,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1605,11 +1727,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1643,9 +1804,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1667,14 +1828,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1694,20 +1855,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1724,14 +1885,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1750,14 +1911,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1776,14 +1937,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1805,20 +1966,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -81,7 +82,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -88,6 +90,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -96,12 +99,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label extra.label sort.label short.list }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -110,8 +133,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -146,9 +169,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -209,17 +232,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -326,8 +349,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -334,15 +355,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -617,6 +642,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -710,16 +749,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -726,7 +765,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -750,17 +789,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -1078,7 +1165,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -1512,7 +1599,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1523,7 +1610,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1532,19 +1619,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1553,7 +1640,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1562,6 +1649,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1592,7 +1687,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1625,12 +1720,53 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
author format.key output
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1655,7 +1791,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1685,7 +1821,7 @@
output.bibitem
author.before
author format.key output
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1706,7 +1842,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1741,7 +1877,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1768,7 +1904,7 @@
{
output.bibitem
editor format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1789,7 +1925,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1826,7 +1962,7 @@
if$
author format.key output
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1852,12 +1988,52 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ author format.key output
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1893,9 +2069,9 @@
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1918,14 +2094,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1945,21 +2121,21 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1977,14 +2153,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2004,14 +2180,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2031,14 +2207,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2060,21 +2236,21 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -81,7 +82,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -88,6 +90,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -96,12 +99,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label extra.label sort.label short.list }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -110,8 +133,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -146,9 +169,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -209,17 +232,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -326,8 +349,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -334,15 +355,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -617,6 +642,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -710,16 +749,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -726,7 +765,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -750,17 +789,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -1078,7 +1165,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -1512,7 +1599,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1523,7 +1610,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1532,19 +1619,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1553,7 +1640,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1562,6 +1649,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1592,7 +1687,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1625,12 +1720,53 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
author format.key output
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1655,7 +1791,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1685,7 +1821,7 @@
output.bibitem
author.before
author format.key output
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1706,7 +1842,7 @@
output.bibitem
author.before
author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1741,7 +1877,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1768,7 +1904,7 @@
{
output.bibitem
editor format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1789,7 +1925,7 @@
author.before
author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1826,7 +1962,7 @@
if$
author format.key output
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1852,12 +1988,52 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ author format.key output
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1893,9 +2069,9 @@
format.authors output
author format.key output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1918,14 +2094,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1945,21 +2121,21 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1977,14 +2153,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2004,14 +2180,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2031,14 +2207,14 @@
format.authors "author" output.check
author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -2060,21 +2236,21 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
title format.key output
- new.column
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -17,7 +17,7 @@
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
%%
-%% Current version: 1.2d, 2016.02.18
+%% Current version: 1.2g, 2016.07.25
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,6 +27,7 @@
+
%%
%% This bibstyle attempts to format bibliography according to
%% GOST 7.0.5-2008 for bibliographic reference.
@@ -55,7 +56,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -62,6 +64,7 @@
language
langid % new in v1.2c
booklanguage
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -70,12 +73,32 @@
eprinttype % = archivePrefix
eprintclass % = primaryClass
eprint
+ % new in v1.2f:
+ % appear in biblatex:
+ addendum
+ holder
+ location
+ subtitle
+ titleaddon
+ version
+ % Appear in biblatex-gost:
+ authorcountry % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{ #0 'before.all :=
@@ -84,8 +107,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -120,9 +143,9 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
{ "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
{ "~; " * write$ }
{ add.period$ " " * write$ }
if$
@@ -183,17 +206,17 @@
if$
}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -300,8 +323,6 @@
if$
}
-FUNCTION {enclose.square.brackets} { }
-
FUNCTION {bracify}
{ duplicate$ empty$
{ pop$ "{}" }
@@ -308,15 +329,19 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
@@ -577,6 +602,20 @@
if$}
if$}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+ { "{Режим доступу}" }
+ { curlanguage "russian" =
+ { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
FUNCTION {bbl.urldate}
{ curlanguage "english" =
{"online; accessed"}
@@ -670,16 +709,16 @@
if$}
if$}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
{ "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -686,7 +725,7 @@
{ "{Электронный ресурс}" }
{ curlanguage "ukrainian" =
{ "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
@@ -710,17 +749,65 @@
{ "{исполн.}" }
{ curlanguage "ukrainian" =
{ "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+ { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+ { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+ { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
@@ -918,7 +1005,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -926,20 +1013,6 @@
}
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -1273,7 +1346,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -1284,7 +1357,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -1293,19 +1366,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -1314,7 +1387,7 @@
{ url empty$
{ "" }
{
- "URL: \BibUrl{" url * "}" *
+ bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -1323,6 +1396,14 @@
if$
}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
FUNCTION {format.annote}
{ annote empty$
{ "" }
@@ -1353,7 +1434,7 @@
if$
}
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
@@ -1386,11 +1467,52 @@
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1414,7 +1536,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1443,7 +1565,7 @@
{
output.bibitem
author.before
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -1463,7 +1585,7 @@
{
output.bibitem
author.before
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1497,7 +1619,7 @@
output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1523,7 +1645,7 @@
FUNCTION {proceedings}
{
output.bibitem
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -1543,7 +1665,7 @@
{ output.bibitem
author.before
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -1579,7 +1701,7 @@
{ format.authors output.nonnull }
if$
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -1605,11 +1727,50 @@
fin.entry
}
+FUNCTION {patent}
+{
+ output.bibitem
+ title add.media output.nonnull
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
FUNCTION {misc}
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -1643,9 +1804,9 @@
{ output.bibitem
format.authors output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+ howpublished output
editor.organization.after
new.sentence
new.block
@@ -1667,14 +1828,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1694,20 +1855,20 @@
FUNCTION {report}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -1724,14 +1885,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1750,14 +1911,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1776,14 +1937,14 @@
{ output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -1805,20 +1966,20 @@
FUNCTION {techreport}
{
output.bibitem
- format.title add.doi add.medium "title" output.check
- new.column
+ format.title add.doi add.media "title" output.check
+ new.colon
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/README
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/README 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/README 2016-07-30 23:13:20 UTC (rev 41778)
@@ -1,4 +1,4 @@
-GOST is a bundle of BibTeX styles designed to meet State Standards (GOST)
+GOST is a bundle of BibTeX styles designed to match the State Standards (GOST)
on information, librarianship and publishing issued by The Russian Federation
and Interstate Committee of former USSR States.
@@ -98,11 +98,10 @@
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 the 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.
+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
of styles compiled with the option |natbib| bear the suffix |n|. Currently
@@ -149,7 +148,7 @@
2. Add the field language="ukrainian" or language="russian" to the
bibliographic entries in Ukrainian or Russian languages in your
database; English is the default language. German, Italian and
- French are also supported.
+ French are partially supported.
3. To compile list of references from your database use bibtex8.exe
rather than bibtex.exe. Depending on the codepage of your
@@ -169,7 +168,7 @@
should be preferred as well when using 8bit compilers
(latex and pdflatex) if source file is in utf8 encoding.
-6. Neither bitex.exe nor bitex8.exe provides
+6. Neither bibtex.exe nor bibtex8.exe provide
correct sorting order of unicode text. It means that using
ugost2008s or any other style ended with `s' in
its name may produce unexpected result for utf8 documents.
@@ -213,21 +212,29 @@
appears at the beginning of a line.
-Where to get from from
+Where to get from
1. http://mirror.ctan.org/biblio/bibtex/contrib/gost/
2. http://ctan.org/pkg/gost
-What's new in version 1.2f (2016.07.12)
-1. Support for patent entry added (thanks to Stanislav Kruchinin).
+What's new in version 1.2g (2016.07.25)
+
+1. Minor changes in documentation.
+
+
+What's new in version 1.2f (2016.07.11)
+
+1. Support for |@patent| entry added (thanks to Stanislav Kruchinin).
2. medium field renamed to media field.
+
What's new in version 1.2e (2016.07.07)
1. Hard coded "URL" string replaced with a language sensitive string
(thanks to Roman Budnyi).
+
What's new in version 1.2d (2016.02.18)
1. jan, feb, mar, e.t.c. month macros fixed;
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib 2016-07-30 23:13:20 UTC (rev 41778)
@@ -523,42 +523,42 @@
url = {http://ufn.ru/ru/articles/2015/7/c/},
}
@PATENT{patent1,
- author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
- authortype = {\xD1\xD8\xC0},
- title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xE7\xE0\xFF\xE2\xEA\xE0},
- number = {1095735},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- publdate = {10.03.2001},
- publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {\xD1\xD8\xC0},
- pagetotal = {5 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authorcountry = {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber = {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
@PATENT{patent2,
- author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
- authortype = {\xD0\xD4},
- title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xEF\xE0\xF2.},
- number = {2000131736/09},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
- pagetotal = {2 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authorcountry = {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber = {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2003.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-customized.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008e.goodbst
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008e.goodbst 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008e.goodbst 2016-07-30 23:13:20 UTC (rev 41778)
@@ -1,1807 +0,0 @@
-%%
-%% This is file `gost2008e.bst',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% gost.dtx (with options: `bst,modern,eprint')
-%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This file has the LPPL maintenance status "maintained".
-%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
-%%
-%% Please, send bug report via e-mail:
-%% kia999 at mail dot ru <Igor Kotelnikov>
-%% or
-%% polyama at yahoo dot edu <Maksym Polyakov>
-%%
-
-
-%%
-%% This bibstyle attempts to format bibliography according to
-%% GOST 7.0.5-2008 for bibliographic reference.
-
-ENTRY
- { address
- annote
- author
- booktitle
- bookauthor
- chapter
- edition
- editor
- compiler
- howpublished
- institution
- journal
- key
- month
- note
- number
- organization
- pages
- publisher
- school
- series
- title
- type
- volume
- year
- totalpages
- language
- booklanguage
- url
- urldate
- isbn
- doi
- archive
- eprinttype
- eprintclass
- eprint
- }
- {}
- { label }
-
-INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
-
-FUNCTION {init.state.consts}
-{ #0 'before.all :=
- #1 'mid.sentence :=
- #2 'after.sentence :=
- #3 'after.block :=
- #4 'after.dblslash :=
- #5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
-}
-
-STRINGS { s t }
-
-STRINGS { curlanguage }
-
-FUNCTION {change.language}
-{ booklanguage empty$
- { "" }
- { booklanguage 'curlanguage :=
- "\selectlanguageifdefined{"
- curlanguage *
- "}" *
- }
- if$
-}
-
-FUNCTION {output.nonnull}
-{
- swap$
- output.state mid.sentence =
- { ", " * write$ }
- { output.state after.block =
- { add.period$ write$
- " \BibDash " write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { output.state after.dblslash =
- { "~//" * change.language * " " * write$ }
- { output.state after.slash =
- { "~/ " * write$ }
- { output.state after.column =
- { ": " * write$ }
- { output.state after.semicolumn =
- { "; " * write$ }
- { add.period$ " " * write$ }
- if$
- }
- if$
- }
- if$
- }
- if$
- }
- if$
- }
- if$
- mid.sentence 'output.state :=
- }
- if$
-}
-
-FUNCTION {output}
-{ duplicate$ empty$
- 'pop$
- 'output.nonnull
- if$
-}
-
-FUNCTION {output.check}
-{ 't :=
- duplicate$ empty$
- { pop$ "empty " t * " in " * cite$ * warning$ }
- 'output.nonnull
- if$
-}
-
-FUNCTION {fin.entry}
-{ add.period$
- write$
- newline$
-}
-
-FUNCTION {new.block}
-{ output.state before.all =
- 'skip$
- { after.block 'output.state := }
- if$
-}
-
-FUNCTION {new.dblslash}
-{ output.state before.all =
- 'skip$
- { after.dblslash 'output.state := }
- if$
-}
-
-FUNCTION {new.slash}
-{ output.state before.all =
- 'skip$
- { after.slash 'output.state := }
- if$
-}
-
-FUNCTION {new.column}
-{ output.state before.all =
- 'skip$
- { after.column 'output.state := }
- if$
-}
-
-FUNCTION {new.semicolumn}
-{ output.state before.all =
- 'skip$
- { after.semicolumn 'output.state := }
- if$
-}
-
-FUNCTION {new.sentence}
-{ output.state after.block =
- 'skip$
- { output.state before.all =
- 'skip$
- { after.sentence 'output.state := }
- if$
- }
- if$
-}
-
-FUNCTION {add.blank}
-{ " " * before.all 'output.state :=
-}
-
-FUNCTION {not}
-{ { #0 }
- { #1 }
- if$
-}
-
-FUNCTION {and}
-{ 'skip$
- { pop$ #0 }
- if$
-}
-
-FUNCTION {or}
-{ { pop$ #1 }
- 'skip$
- if$
-}
-
-FUNCTION {non.stop}
-{ duplicate$
- "}" * add.period$
- #-1 #1 substring$ "." =
-}
-
-FUNCTION {new.block.checka}
-{ empty$
- 'skip$
- 'new.block
- if$
-}
-
-FUNCTION {new.block.checkb}
-{ empty$
- swap$ empty$
- and
- 'skip$
- 'new.block
- if$
-}
-
-FUNCTION {new.sentence.checka}
-{ empty$
- 'skip$
- 'new.sentence
- if$
-}
-
-FUNCTION {new.sentence.checkb}
-{ empty$
- swap$ empty$
- and
- 'skip$
- 'new.sentence
- if$
-}
-
-FUNCTION {field.or.null}
-{ duplicate$ empty$
- { pop$ "" }
- 'skip$
- if$
-}
-
-FUNCTION {emphasize}
-{ duplicate$ empty$
- { pop$ "" }
- { "\BibEmph{" swap$ * "}" * }
- if$
-}
-
-FUNCTION {space.word}
-{ " " swap$ * " " * }
-
-FUNCTION {bbl.edby} % { "\bbledby{}" }
-{ curlanguage "english" =
- {"Ed. by "}
- { curlanguage "ukrainian" =
- {"{\cyr\CYRP\cyrii\cyrd\ \cyrr\cyre\cyrd.\ }"}
- { curlanguage "russian" =
- {"{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }"}
- { curlanguage "german" =
- { "ed. " }
- {"language is not defined: " language "edited by" * * warning$ "edited by"}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.cmplr}
-{ curlanguage "english" =
- { "Compiler "}
- { curlanguage "german" =
- { "Hrsg. " }
- { curlanguage "ukrainian" =
- {"{\cyr\CYRU\cyrk\cyrl.\ }"}
- { curlanguage "russian" =
- {"{\cyr\CYRS\cyro\cyrs\cyrt.\ }"}
- {"language is not defined: " language "compiler" * * warning$ "compiler"}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.edition} % { "\bbledition{}" }
-{ curlanguage "english" =
- {"edition"}
- { curlanguage "ukrainian" =
- {"{\cyr\cyrv\cyri\cyrd.}"}
- { curlanguage "russian" =
- {"{\cyr\cyri\cyrz\cyrd.}"}
- { curlanguage "german" =
- {" {aus.}" } %%%% { "Aufl." } ??
- { curlanguage "italian" =
- {"edizione"}
- { curlanguage "french" =
- {"\'{e}dition"}
- {"language is not defined: " language "edition" * * warning$ "edition"}
- if$}
- if$}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
-{ curlanguage "english" = curlanguage "french" = or curlanguage "italian" = or
- {"Volume"}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- { "\CYRT\cyro\cyrm" }
- { curlanguage "german" =
- {"{Band}"} %%%% { "Volumen" }
- {"language is not defined: " language "Volume" * * warning$ "Volume"}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.vvol} % { "\bblVol{}" }
-{ curlanguage "english" = curlanguage "french" = or curlanguage "italian" = or
- {"Vol."}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- {"\CYRT."}
- { curlanguage "german" =
- {"{Bd.}"} %%%% { "Vol." }
- {"language is not defined: " language "Vol." * * warning$ "Vol."}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.iissue} % { "\bblIssue{}" }
-{ curlanguage "english" =
- {"Issue"}
- { curlanguage "ukrainian" =
- {"\CYRV\cyri\cyrp\cyru\cyrs\cyrk"}
- { curlanguage "russian" =
- {"\CYRV\cyrery\cyrp\cyru\cyrs\cyrk"}
- { curlanguage "german" =
- {"{Heft}"} %%%% { "Ausgabe" }
- {"language is not defined: " language * warning$ "Issue"}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.iiss} % { "\bblIss{}" }
-{ curlanguage "english" =
- {"Iss."}
- { curlanguage "ukrainian" =
- {"\CYRV\cyri\cyrp."}
- { curlanguage "russian" =
- {"\CYRV\cyrery\cyrp."}
- { curlanguage "german" =
- {"{H.}"} %%% { "Aus." }??
- {"language is not defined: " language * warning$ "Iss"}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.of} % { "\bblof{}" }
-{ curlanguage "english" =
- {"of"}
- { curlanguage "german" =
- { "von" }
- { curlanguage "ukrainian" =
- { "{\cyr\cyrii\cyrz}" }
- { curlanguage "russian" =
- { "{\cyr\cyri\cyrz}" }
- {"language is not defined: " language "of" * * warning$ "of"}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.etal} % { "\bblof{}" }
-{ curlanguage "english" =
- {"et~al."}
- { curlanguage "german" =
- { "u.~a." }
- { curlanguage "ukrainian" =
- {"{\cyr\cyrt\cyra~\cyrii\cyrn.}"}
- { curlanguage "russian" =
- {"{\cyr\cyri~\cyrd\cyrr.}"}
- {"language is not defined: " language "at al" * * warning$ "at al."}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
-{ curlanguage "english" =
- {"Number"}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- { "\CYRN\cyro\cyrm\cyre\cyrr" }
- { curlanguage "german" =
- {"{Heft}"} %%% { "Anzahl" }
- {"language is not defined: " language "Number" * * warning$ "Number"}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.number} % { "\bblnumber{}" }
-{ curlanguage "english" =
- {"number"}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- {"{\cyr\cyrn\cyro\cyrm\cyre\cyrr}"}
- { curlanguage "german" =
- {"{Heft}"} %%% { "anzahl" }???
- {"language is not defined: " language "number" * * warning$ "number"}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.nr} % { "\bblno{}" }
-{ curlanguage "english" =
- {"no."}
- { curlanguage "italian" =
- { "no" }
- { curlanguage "ukrainian" = curlanguage "russian" = or
- { "{\cyr\textnumero}" }
- { curlanguage "german" =
- {"{H.}"} %%% { "an." }
- {"language is not defined: " language "no." * * warning$ "no."}
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.nnr} % { "\bblno{}" }
-{ curlanguage "english" =
- {"No."}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- { "{\cyr\textnumero}" }
- { curlanguage "german" =
- {"{H.}"} %%% { "an." }
- {"language is not defined: " language "No." * * warning$ "No."}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.in} % { "\bblin{}" }
-{ curlanguage "english" = curlanguage "german" = or
- {"in"}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- { "{\cyr\cyrv}" }
- {"language is not defined: " language "in" * * warning$ "in"}
- if$}
-if$}
-
-FUNCTION {bbl.iin} % { "\bblIn{}" }
-{ curlanguage "english" = curlanguage "german" = or
- {"In"}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- { "\CYRV" }
- {"language is not defined: " language "In" * * warning$ "In"}
- if$}
-if$}
-
-FUNCTION {bbl.pages} % { "\bblpp." }
-{ curlanguage "english" = curlanguage "french" = or curlanguage "italian" = or
- {"p."} %%% {"pp."}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- {"{\cyr\cyrs.}"}
- { curlanguage "german" =
- {"S."} %%%% { "s." }
- {"language is not defined: " language "pp." * * warning$ "pp."}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.page} % { "\bblp."
-{ curlanguage "english" = curlanguage "french" = or curlanguage "italian" = or
- {"p."}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- {"{\cyr\cyrs.}"}
- { curlanguage "german" =
- {"S."} %%%% { "s." }
- {"language is not defined: " language "p." * * warning$ "p."}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.ppages}% { "\bblPp." }
-{ curlanguage "english" = curlanguage "french" = or curlanguage "italian" = or
- {"P."} %%%% { "Pp." }
- { curlanguage "ukrainian" = curlanguage "russian" = or
- {"{\cyr\CYRS.}"}
- { curlanguage "german" =
- {"S."}
- {"language is not defined: " language "Pp." * * warning$ "Pp."}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.ppage} % { "\bblP." }
-{ curlanguage "english" = curlanguage "french" = or curlanguage "italian" = or
- {"P."}
- { curlanguage "ukrainian" = curlanguage "russian" = or
- {"{\cyr\CYRS.}"}
- { curlanguage "german" =
- {"S."}
- {"language is not defined: " language "P." * * warning$ "P."}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.urldate}
-{ curlanguage "english" =
- {"online; accessed: "}
- { curlanguage "ukrainian" =
- { "\cyrd\cyra\cyrt\cyra\ \cyrz\cyrv\cyre\cyrr\cyre\cyrn\cyrn\cyrya:" }
- { curlanguage "russian" =
- { "{\cyrd\cyra\cyrt\cyra\ \cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya: }" }
- { curlanguage "german" =
- { "{online; abgerufen: }" }
- { "language is not defined: " language * warning$ "online; accessed: " }
- if$}
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.techrep} % rename to bbl.techreport
-{ curlanguage "english" =
- { "Tech.~Rep." }
- { curlanguage "german" =
- { "Tech.~Bericht" }
- { curlanguage "russian" =
- { "{\cyr\CYRT\cyre\cyrh.\ \cyrd\cyro\cyrk\cyrl\cyra\cyrd}" }
- { "language is not defined: " language * warning$ "Tech.~Rep." }
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.mthesis}
-{ curlanguage "english" =
- { "Master's thesis" }
- { curlanguage "german" =
- { "Diss.~Mag." }
- { curlanguage "russian" =
- { "{\cyr\CYRK\cyrv\cyra\cyrl\cyri\cyrf\cyri\cyrk\cyra\cyrc\cyri"
- "\cyro\cyrn\cyrn\cyra\cyrya\ \cyrr\cyra\cyrb\cyro\cyrt\cyra\ " *
- "\cyrm\cyra\cyrg\cyri\cyrs\cyrt\cyrr\cyra}" * }
- { "language is not defined: " language * warning$ "Master's thesis" }
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.phdthesis}
-{ curlanguage "english" =
- { "Ph.\,D. thesis" }
- { 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}" * }
- { "language is not defined: " language * warning$ "Ph.\,D. thesis" }
- if$}
- if$}
-if$}
-
-FUNCTION {bbl.dscithesis} %%% rename this to dscthesis
-{ 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 * warning$ "In" }
- if$}
- if$}
-if$}
-
-INTEGERS { nameptr namesleft numnames }
-
-FUNCTION {format.names}
-{
- 's :=
- #1 'nameptr :=
- s num.names$ 'numnames :=
- numnames 'namesleft :=
- { namesleft #0 > }
- { s nameptr
- "{vv~}{ll}{~jj}{~f.}" format.name$ 't :=
- nameptr #1 >
- { nameptr #4 =
- numnames #4 > and
- { "others" 't :=
- #1 'namesleft := }
- 'skip$
- if$
- namesleft #1 >
- { ", " * t * }
- { t "others" =
- t "~others" =
- or
- { " " * bbl.etal * }
- { ", " * t * }
- if$
- }
- if$
- }
- 't
- if$
- nameptr #1 + 'nameptr :=
- namesleft #1 - 'namesleft :=
- }
- while$
-}
-
-FUNCTION {format.names.rev}
-{
- 's :=
- #1 'nameptr :=
- s num.names$ 'numnames :=
- numnames 'namesleft :=
- { namesleft #0 > }
- { s nameptr
- "{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
- nameptr #1 >
- { nameptr #4 =
- numnames #4 > and
- { "others" 't :=
- #1 'namesleft := }
- 'skip$
- if$
- namesleft #1 >
- { ", " * t * }
- { t "others" =
- t "~others" =
- or
- { " " * bbl.etal * }
- { ", " * t * }
- if$
- }
- if$
- }
- 't
- if$
- nameptr #1 + 'nameptr :=
- namesleft #1 - 'namesleft :=
- }
- while$
-}
-
-FUNCTION {format.authors}
-{ author empty$
- { "" }
- { author format.names emphasize}
- if$
-}
-
-FUNCTION {format.bookauthors}
-{ bookauthor empty$
- { "" }
- { bookauthor format.names}
- if$
-}
-
-FUNCTION {format.authors.after}
-{ author empty$
- { "" }
- { author format.names.rev}
- if$
-}
-
-FUNCTION {format.bookauthors.after}
-{ bookauthor empty$
- { "" }
- { bookauthor format.names.rev}
- if$
-}
-
-FUNCTION {format.editors.after}
-{ editor empty$
- { "" }
- { bbl.edby editor format.names.rev *
- }
- if$
-}
-
-FUNCTION {format.compiler.after}
-{ compiler empty$
- { "" }
- { bbl.cmplr compiler format.names.rev *
- }
- if$
-}
-
-FUNCTION {format.title}
-{ title empty$
- { "" }
- { title "t" change.case$
- }
- if$
-}
-
-FUNCTION {format.date}
-{ year empty$
- { month empty$
- { "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
- if$
- }
- { month empty$
- 'year
- { year ". " quote$ "--- " month * * * * }
- if$
- }
- if$
-}
-
-FUNCTION {output.address.publisher.date}
-{
- address empty$
- 'skip$
- { address output
- publisher empty$
- 'skip$
- { new.column }
- if$
- }
- if$
- publisher output
- format.date output
-}
-
-FUNCTION {output.bibitem}
-{ newline$
- "\bibitem{" write$
- cite$ write$
- "}" write$
- newline$
- language empty$
- {"english" 'curlanguage :=}
- {language 'curlanguage :=}
- if$
- "\selectlanguageifdefined{" write$
- curlanguage write$
- "}" write$ newline$
- ""
- before.all 'output.state :=
-}
-
-FUNCTION {n.dashify}
-{ 't :=
- ""
- { t empty$ not }
- { t #1 #1 substring$ "-" =
- { t #1 #2 substring$ "--" = not
- { "--" *
- t #2 global.max$ substring$ 't :=
- }
- { { t #1 #1 substring$ "-" = }
- { "-" *
- t #2 global.max$ substring$ 't :=
- }
- while$
- }
- if$
- }
- { t #1 #1 substring$ *
- t #2 global.max$ substring$ 't :=
- }
- if$
- }
- while$
-}
-
-FUNCTION {word.in}
-{ bbl.iin
- " " * }
-
-FUNCTION {format.btitle}
-{ title
-}
-
-FUNCTION {tie.or.space.connect}
-{ duplicate$ text.length$ #3 <
- { "~" }
- { " " }
- if$
- swap$ * *
-}
-
-FUNCTION {tie.connect}
- {"~"
- swap$ * *
- }
-
-FUNCTION {either.or.check}
-{ empty$
- 'pop$
- { "can't use both " swap$ * " fields in " * cite$ * warning$ }
- if$
-}
-
-FUNCTION {format.bvolume}
-{ volume empty$
- { "" }
- { bbl.vvol volume tie.connect
- series empty$
- 'skip$
- { bbl.of space.word * series emphasize * }
- if$
- "volume and number" number either.or.check
- }
- if$
-}
-
-FUNCTION {format.number.series}
-{ volume empty$
- { number empty$
- { series field.or.null }
- { series empty$
- { "there's a number but no series in " cite$ * warning$
- bbl.nnr }
- {
- %new.dblslash
- new.sentence
- series
- bbl.nr
- tie.or.space.connect}
- if$
- number tie.or.space.connect
- }
- if$
- }
- { "" }
- if$
-}
-
-FUNCTION {is.num}
-{ chr.to.int$
- duplicate$ "0" chr.to.int$ < not
- swap$ "9" chr.to.int$ > not and
-}
-
-FUNCTION {extract.num}
-{ duplicate$ 't :=
- "" 's :=
- { t empty$ not }
- { t #1 #1 substring$
- t #2 global.max$ substring$ 't :=
- duplicate$ is.num
- { s swap$ * 's := }
- { pop$ "" 't := }
- if$
- }
- while$
- s empty$
- 'skip$
- { pop$ s }
- if$
-}
-
-
-FUNCTION {convert.edition}
-{ edition
-}
-
-FUNCTION {format.edition}
-{ edition empty$
- { "" }
- { output.state mid.sentence =
- { convert.edition "l" change.case$ " " * bbl.edition * }
- { convert.edition "t" change.case$ " " * bbl.edition * }
- if$
- }
- if$
-}
-
-INTEGERS { multiresult }
-
-FUNCTION {multi.page.check}
-{ 't :=
- #0 'multiresult :=
- { multiresult not
- t empty$ not
- and
- }
- { t #1 #1 substring$
- duplicate$ "-" =
- swap$ duplicate$ "," =
- swap$ "+" =
- or or
- { #1 'multiresult := }
- { t #2 global.max$ substring$ 't := }
- if$
- }
- while$
- multiresult
-}
-
-FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
- if$
- }
- if$
-}
-
-FUNCTION {format.pages.page}
-{ pages empty$
- { totalpages empty$
- { "" }
- { totalpages bbl.pages tie.connect }
- if$}
- { format.pages}
- if$
-}
-
-FUNCTION {format.vol.num.pages}
-{ volume field.or.null
- number empty$
- 'skip$
- {
- ", no." number tie.or.space.connect *
- volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
- 'skip$
- if$
- }
- if$
- pages empty$
- 'skip$
- { duplicate$ empty$
- { pop$ format.pages }
- { ": " * pages n.dashify * }
- if$
- }
- if$
-}
-
-FUNCTION {format.volume}
-{ volume empty$
- { "" }
- { bbl.vvol volume tie.or.space.connect }
- if$
-}
-
-FUNCTION {format.number}
-{ number empty$
- { "" }
- { bbl.nr number tie.or.space.connect }
- if$
-}
-
-
-FUNCTION {empty.misc.check}
-{ author empty$ title empty$ howpublished empty$
- month empty$ year empty$ note empty$
- and and and and and
- key empty$ not and
- { "all relevant fields are empty in " cite$ * warning$ }
- 'skip$
- if$
-}
-
-FUNCTION {format.thesis.type}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
-}
-
-FUNCTION {format.tr.number}
-{ type empty$
- { bbl.techrep }
- 'type
- if$
- number empty$
- { "t" change.case$ }
- { number tie.or.space.connect }
- if$
-}
-
-FUNCTION {author.before}
-{
- author empty$
- 'skip$
- {author num.names$ #4 <
- {format.authors output
- new.sentence}
- 'skip$
- if$}
- if$
-}
-
-FUNCTION {bookauthor.before}
-{
- bookauthor empty$
- 'skip$
- {bookauthor num.names$ #4 <
- {format.bookauthors output
- new.sentence}
- 'skip$
- if$}
- if$
-}
-
-FUNCTION {author.after}
-{
- author empty$
- 'skip$
- {author num.names$ #3 >
- {format.authors.after output
- new.semicolumn }
- 'skip$
- if$}
- if$
-}
-
-FUNCTION {bookauthor.after}
-{
- bookauthor empty$
- 'skip$
- {bookauthor num.names$ #3 >
- {format.bookauthors.after output
- new.semicolumn }
- 'skip$
- if$}
- if$
-}
-
-FUNCTION {editor.organization.after}
-{
- compiler empty$
- {}
- { format.compiler.after output
- new.semicolumn
- }
- if$
- editor empty$
- {}
- { format.editors.after output
- new.semicolumn
- }
- if$
- organization empty$
- {}
- {organization output
- new.semicolumn
- }
- if$
-}
-
-FUNCTION {format.url}
-{ url empty$
- { "" }
- {
- "URL: \BibUrl{" url * "}" *
- urldate empty$
- { "" }
- { " (" bbl.urldate * urldate * ")" * }
- if$ *
- }
- if$
-}
-
-FUNCTION {format.annote}
-{ annote empty$
- { "" }
-{ after.sentence 'output.state :=
- "\BibAnnote{" annote add.period$ * "}" *
-}
- if$
-}
-
-FUNCTION {format.isbn}
-{
- isbn empty$
- { "" }
- { "ISBN:~\href{http://isbndb.com/search-all.html?kw=" isbn *
- "}{" * isbn * "}" *
- }
- if$
-}
-
-FUNCTION {add.doi}
-{
-% duplicate$ empty$
-% 'skip$
-% { doi empty$
-% 'skip$
-% { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
-% if$
-% }
-% if$
-}
-
-
-%FUNCTION {format.eprint}
-%{ eprint empty$
-% { "" }
-% { eprintclass empty$
-% { " \href{http://arxiv.org/abs/" eprint * "}" * "{" * eprint * "}" * }
-% { eprinttype empty$
-% { " \href{http://arxiv.org/abs/" eprint * "}" *
-% "{" * eprintclass * "/" * eprint * "}" *
-% }
-% { " \href{http://arxiv.org/abs/" eprint * "}" *
-% "{" * eprinttype * ":" * eprintclass * "/" * eprint * "}" *
-% }
-% if$}
-% if$}
-%if$}
-%FUNCTION {format.eprint}
-%{ eprint empty$
-% { "" }
-% { eprinttype empty$
-% { "" }
-% { eprinttype "~: " *}
-% if$
-% eprintclass empty$
-% { }
-% { eprintclass * "/" *}
-% if$
-% eprint *
-% }
-% if$
-%}
-%FUNCTION {format.eprint}
-%{ eprint empty$
-% { "" }
-% { eprinttype empty$
-% { "" }
-% { eprinttype "~: " *}
-% if$
-% eprintclass empty$
-% { }
-% { eprintclass * "/" *}
-% if$
-% eprint *
-% }
-% if$
-% url empty$
-% { }
-% { "\href{" url * "}{" * swap$ * "}" *}
-% if$
-%}
-
-FUNCTION {format.eprint}
-{ eprint empty$
- { "" }
- { eprinttype empty$
- { "" }
- { eprinttype "~: " *}
- if$
- eprintclass empty$
- { }
- { eprintclass * "/" *}
- if$
- url empty$
- { eprint * }
- { "\href{" * url * "}{" * eprint * "}" *}
- if$
- }
- if$
-}
-
-FUNCTION {output.eprint.url}
-{
- eprint empty$
- { format.url output }
- { format.eprint output }
- if$
-}
-
-FUNCTION {article}
-{
- output.bibitem
- author.before
- format.title "title" output.check
- new.slash
- author.after
- new.dblslash
- journal emphasize add.doi "journal" output.check % new in v.2
- new.block
- format.date output
- new.block
- format.volume output
- format.number output
- new.block
- format.pages.page output
- new.block
- note output
- new.sentence
-% format.eprint output % new in v.2
-% new.block % new in v.2
-% format.url output
- output.eprint.url
- format.annote output
- fin.entry
-}
-
-FUNCTION {book}
-{
- output.bibitem
- author.before
- format.btitle add.doi "title" output.check
- new.slash
- author.after
- editor.organization.after
- new.sentence
- format.number.series output
- new.block
- format.edition output
- new.block
- output.address.publisher.date
- new.block
- format.bvolume output
- new.block
- format.pages.page output
- new.block
- format.isbn output
- new.block
- note output
- new.sentence
-% format.eprint output % new in v.2
-% new.block % new in v.2
-% format.url output
- output.eprint.url
- format.annote output
- fin.entry
-}
-
-FUNCTION {booklet}
-{
- output.bibitem
- author.before
- format.title "title" output.check
- new.slash
- author.after
- editor.organization.after
- new.block
- howpublished output
- address output
- format.date output
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {inbook}
-{
- output.bibitem
- author.before
- format.btitle add.doi "title" output.check
- new.slash
- author.after
- new.dblslash
- bookauthor.before
- booktitle "booktitle" output.check
- new.slash
- bookauthor.after
- editor.organization.after
- new.block
- format.edition output
- new.block
- format.number.series output
- new.sentence
- output.address.publisher.date
- new.block
- format.bvolume output
- new.block
- format.pages.page output
- new.block
- format.isbn output
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {incollection}
-{
- output.bibitem
- author.before
- new.sentence
- format.title add.doi "title" output.check
- new.slash
- author.after
- new.dblslash
- booktitle "booktitle" output.check
- new.slash
- editor.organization.after
- new.block
- output.address.publisher.date
- new.block
- format.bvolume output
- format.number.series output
- new.block
- format.pages.page output
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {inproceedings}
-{ output.bibitem
- author.before
- new.sentence
- format.title add.doi "title" output.check
- new.slash
- author.after
- new.dblslash
- booktitle "booktitle" output.check
- new.slash
- editor.organization.after
- new.block
- format.bvolume output
- format.number.series output
- new.block
- address empty$
- { publisher output
- format.date "year" output.check
- }
- { address output.nonnull
- new.column
- publisher output
- format.date "year" output.check
- }
- if$
- new.block
- format.pages.page output
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {conference} { inproceedings }
-
-FUNCTION {manual}
-{ output.bibitem
- author empty$
- { organization empty$
- 'skip$
- { organization output.nonnull
- address output
- }
- if$
- }
- { format.authors output.nonnull }
- if$
- new.block
- format.btitle "title" output.check
- author empty$
- { organization empty$
- {
- address new.block.checka
- address output
- }
- 'skip$
- if$
- }
- {
- organization address new.block.checkb
- organization output
- address output
- }
- if$
- format.edition output
- format.date output
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {mastersthesis}
-{
- output.bibitem
- format.authors "author" output.check
- new.block
- format.btitle add.doi "title" output.check
- new.block
- bbl.mthesis format.thesis.type output.nonnull
- school "school" output.check
- address output
- format.date "year" output.check
- new.block
- note output
- new.block
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {misc}
-{ output.bibitem
- format.authors output
- title howpublished new.sentence.checkb
- format.title output
- howpublished new.block.checka
- howpublished output
- new.block
- format.date output
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {phdthesis}
-{ output.bibitem
- format.authors "author" output.check
- new.sentence
- format.btitle add.doi "title" output.check
- new.column
- bbl.phdthesis format.thesis.type output.nonnull
- new.slash
- school "school" output.check
- new.block
- output.address.publisher.date
- new.block
- format.pages.page output
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {dscithesis}
-{
- output.bibitem
- format.authors "author" output.check
- new.sentence
- format.btitle add.doi "title" output.check
- new.column
- bbl.dscithesis format.thesis.type output.nonnull
- new.slash
- school "school" output.check
- new.block
- output.address.publisher.date
- new.block
- format.pages.page output
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {proceedings}
-{
- output.bibitem
- format.btitle add.doi "title" output.check
- new.slash
- editor.organization.after
- 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$
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {techreport}
-{
- output.bibitem
- author.before
- new.sentence
- format.title add.doi "title" output.check
- new.column
- format.tr.number output.nonnull
- new.slash
- author.after
- editor.organization.after
- new.block
- address output
- new.column
- institution "institution" output.check
- format.date "year" output.check
- new.block
- note output
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {unpublished}
-{ output.bibitem
- author.before
- format.btitle "title" output.check
- new.slash
- author.after
- editor.organization.after
- new.block
- note "note" output.check
- new.sentence
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- format.annote output
- fin.entry
-}
-
-FUNCTION {online}
-{ output.bibitem
- format.authors output
- title howpublished new.sentence.checkb
- format.title output
- howpublished new.block.checka
- howpublished output
- new.block
- format.date output
- new.block
- format.eprint output % new in v.2
- new.block % new in v.2
- format.url output
- new.sentence
- note output
- format.annote output
- fin.entry
-}
-
-FUNCTION {default.type} { misc }
-
-MACRO {jan} {"\bbljan{}"}
-MACRO {feb} {"\bblfeb{}"}
-MACRO {mar} {"\bblmar{}"}
-MACRO {apr} {"\bblapr{}"}
-MACRO {may} {"\bblmay{}"}
-MACRO {jun} {"\bbljun{}"}
-MACRO {jul} {"\bbljul{}"}
-MACRO {aug} {"\bblaug{}"}
-MACRO {sep} {"\bblsep{}"}
-MACRO {oct} {"\bbloct{}"}
-MACRO {nov} {"\bblnov{}"}
-MACRO {dec} {"\bbldec{}"}
-
-
-MACRO {aa}{"Astron. \& Astrophys."}
-MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
-MACRO {aj} {"Astron. J."}
-MACRO {aph} {"Acta Phys."}
-MACRO {advp} {"Adv. Phys."}
-MACRO {ajp} {"Amer. J. Phys."}
-MACRO {ajm} {"Amer. J. Math."}
-MACRO {amsci} {"Amer. Sci."}
-MACRO {anofd} {"Ann. Fluid Dyn."}
-MACRO {am} {"Ann. Math."}
-MACRO {ap} {"Ann. Phys. (NY)"}
-MACRO {adp} {"Ann. Phys. (Leipzig)"}
-MACRO {ao} {"Appl. Opt."}
-MACRO {apl} {"Appl. Phys. Lett."}
-MACRO {app} {"Astroparticle Phys."}
-MACRO {apj} {"Astrophys. J."}
-MACRO {apjsup} {"Astrophys. J. Suppl."}
-MACRO {apss} {"Astrophys. Space Sci."}
-MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
-MACRO {baas} {"Bull. Amer. Astron. Soc."}
-MACRO {baps} {"Bull. Amer. Phys. Soc."}
-MACRO {cmp} {"Comm. Math. Phys."}
-MACRO {cpam} {"Commun. Pure Appl. Math."}
-MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
-MACRO {cpc} {"Comp. Phys. Comm."}
-MACRO {cqg} {"Class. Quant. Grav."}
-MACRO {cra} {"C. R. Acad. Sci. A"}
-MACRO {fed} {"Fusion Eng. \& Design"}
-MACRO {ft} {"Fusion Tech."}
-MACRO {grg} {"Gen. Relativ. Gravit."}
-MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
-MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
-MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
-MACRO {ip} {"Infrared Phys."}
-MACRO {irp} {"Infrared Phys."}
-MACRO {jap} {"J. Appl. Phys."}
-MACRO {jasa} {"J. Acoust. Soc. America"}
-MACRO {jcp} {"J. Comp. Phys."}
-MACRO {jchp} {"J. Chem. Phys."}
-MACRO {jetp} {"Sov. Phys.--JETP"}
-MACRO {jfe} {"J. Fusion Energy"}
-MACRO {jfm} {"J. Fluid Mech."}
-MACRO {jmp} {"J. Math. Phys."}
-MACRO {jne} {"J. Nucl. Energy"}
-MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
-MACRO {jnm} {"J. Nucl. Mat."}
-MACRO {jpc} {"J. Phys. Chem."}
-MACRO {jpp} {"J. Plasma Phys."}
-MACRO {jpsj} {"J. Phys. Soc. Japan"}
-MACRO {jsi} {"J. Sci. Instrum."}
-MACRO {jvst} {"J. Vac. Sci. \& Tech."}
-MACRO {nat} {"Nature"}
-MACRO {nature} {"Nature"}
-MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
-MACRO {nf} {"Nucl. Fusion"}
-MACRO {nim} {"Nucl. Inst. \& Meth."}
-MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
-MACRO {np} {"Nucl. Phys."}
-MACRO {npb} {"Nucl. Phys. B"}
-MACRO {nt/f} {"Nucl. Tech./Fusion"}
-MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
-MACRO {inc} {"Nuovo Cimento"}
-MACRO {nc} {"Nuovo Cimento"}
-MACRO {pf} {"Phys. Fluids"}
-MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
-MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
-MACRO {pl} {"Phys. Lett."}
-MACRO {pla} {"Phys. Lett. A"}
-MACRO {plb} {"Phys. Lett. B"}
-MACRO {prep} {"Phys. Rep."}
-MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
-MACRO {pp} {"Phys. Plasmas"}
-MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
-MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
-MACRO {prl} {"Phys. Rev. Lett."}
-MACRO {pr} {"Phys. Rev."}
-MACRO {physrev} {"Phys. Rev."}
-MACRO {pra} {"Phys. Rev. A"}
-MACRO {prb} {"Phys. Rev. B"}
-MACRO {prc} {"Phys. Rev. C"}
-MACRO {prd} {"Phys. Rev. D"}
-MACRO {pre} {"Phys. Rev. E"}
-MACRO {ps} {"Phys. Scripta"}
-MACRO {procrsl} {"Proc. Roy. Soc. London"}
-MACRO {rmp} {"Rev. Mod. Phys."}
-MACRO {rsi} {"Rev. Sci. Inst."}
-MACRO {science} {"Science"}
-MACRO {sciam} {"Sci. Am."}
-MACRO {sam} {"Stud. Appl. Math."}
-MACRO {sjpp} {"Sov. J. Plasma Phys."}
-MACRO {spd} {"Sov. Phys.--Doklady"}
-MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
-MACRO {spu} {"Sov. Phys.--Uspekhi"}
-MACRO {st} {"Sky and Telesc."}
-
-MACRO {appopt} {"Appl. Opt."}
-MACRO {bell} {"Bell Syst. Tech. J."}
-MACRO {ell} {"Electron. Lett."}
-MACRO {jasp} {"J. Appl. Spectr."}
-MACRO {jqe} {"IEEE J. Quantum Electron."}
-MACRO {jlwt} {"J. Lightwave Technol."}
-MACRO {jmo} {"J. Mod. Opt."}
-MACRO {josa} {"J. Opt. Soc. America"}
-MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
-MACRO {josab} {"J. Opt. Soc. Amer.~B"}
-MACRO {jdp} {"J. Phys. (Paris)"}
-MACRO {oc} {"Opt. Commun."}
-MACRO {ol} {"Opt. Lett."}
-MACRO {os} {"Opt. Spectrosc."}
-MACRO {phtl} {"IEEE Photon. Technol. Lett."}
-MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
-MACRO {sjot} {"Sov. J. Opt. Technol."}
-MACRO {sjqe} {"Sov. J. Quantum Electron."}
-MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
-MACRO {stph} {"Sov. Phys.--Techn. Phys."}
-MACRO {stphl} {"Sov. Techn. Phys. Lett."}
-MACRO {vr} {"Vision Res."}
-MACRO {zph} {"Z. f. Physik"}
-MACRO {zphb} {"Z. f. Physik~B"}
-MACRO {zphd} {"Z. f. Physik~D"}
-MACRO {sse} {"Solid-State Electron."}
-MACRO {pss} {"Phys. Sol. State"}
-MACRO {sst} {"Semicond. Sci. Tech."}
-MACRO {nl} {"Nano Lett."}
-
-READ
-
-
-STRINGS { longest.label }
-
-INTEGERS { number.label longest.label.width }
-
-FUNCTION {initialize.longest.label}
-{ "" 'longest.label :=
- #1 'number.label :=
- #0 'longest.label.width :=
-}
-
-FUNCTION {longest.label.pass}
-{ number.label int.to.str$ 'label :=
- number.label #1 + 'number.label :=
- label width$ longest.label.width >
- { label 'longest.label :=
- label width$ 'longest.label.width :=
- }
- 'skip$
- if$
-}
-
-EXECUTE {initialize.longest.label}
-
-ITERATE {longest.label.pass}
-
-FUNCTION {begin.bib}
-{ "\begin{thebibliography}{" longest.label * "}" * write$ newline$
- "\def\selectlanguageifdefined#1{" write$ newline$
- "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
- "\else\language\csname l@#1\endcsname\fi}" write$ newline$
- "\providecommand*{\href}[2]{{\small #2}}" write$ newline$
- "\providecommand*{\url}[1]{{\small #1}}" write$ newline$
- "\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
- "\providecommand{\BibAnnote}[1]{}" write$ newline$
- "\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\providecommand*{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi\cyrdash\hskip.2em\ignorespaces}" write$ newline$
- preamble$ empty$
- 'skip$
- { preamble$ write$ newline$ }
- if$
-}
-
-EXECUTE {begin.bib}
-
-EXECUTE {init.state.consts}
-
-ITERATE {call.type$}
-
-FUNCTION {end.bib}
-{ newline$
- "\end{thebibliography}" write$ newline$
-}
-
-EXECUTE {end.bib}
-
-%%
-%% End of file `gost2008e.bst'.
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost780.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx 2016-07-30 23:13:20 UTC (rev 41778)
@@ -8,7 +8,7 @@
% GOST R 7.0.5-2008 with some conventional modifications.
%
% Copyright 2012-2016 Igor A. Kotelnikov.
-% Version 1.2d
+% Version 1.2g
%
% Copyright 1996-2005 Maksym Polyakov.
% Version 2005.08.12
@@ -17,7 +17,7 @@
% to add the field
% language = {russian}.
% Ukrainian, German, French, Italian languages are
-% also supported. Default language is English.
+% also partially supported. Default language is English.
%
% Book entry should have the pagetotal field
% showing total number of pages. Optional field
@@ -52,7 +52,7 @@
%
%<*driver>
\ProvidesFile{gost.dtx}%
- [2016/02/18 v.1.2d Bibliography styles for GOST R 7.0.5-2008.]
+ [2016/07/25 v.1.2g Bibliography styles for GOST R 7.0.5-2008.]
\documentclass{ltxdoc}
@@ -126,8 +126,11 @@
%</driver>
% \fi
%
-% \CheckSum{508}
+% \CheckSum{548}
%
+% \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}
@@ -427,6 +430,36 @@
% {CTAN:pkg/gost}.
% \end{enumerate}
%
+%
+% \subsection{What's new in version 1.2g (2016.07.25)}
+%
+% \begin{enumerate}
+% \item
+% Minor changes in documentation.
+%
+% \end{enumerate}
+%
+%
+% \subsection{What's new in 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.
+
+% \end{enumerate}
+%
+% \subsection{What's new in version 1.2e (2016.07.07)}
+%
+% \begin{enumerate}
+% \item
+% Hard coded "URL" string replaced with a language sensitive string
+% (thanks to Roman Budnyi).
+%
+% \end{enumerate}
+%
% \subsection{What's new in version 1.2d (2015.02.18)}
%
% \begin{enumerate}
@@ -608,7 +641,8 @@
school
series
title
- medium % new in v1.2.
+ %medium % new in v1.2; renamed to media.
+ media % new in v1.2f
type
volume
year
@@ -616,8 +650,9 @@
langid % new in v1.2c
booklanguage
% \end{macrocode}
-% Remaining entries are borrowed from biblatex.
+% Entries borrowed from biblatex.
% \begin{macrocode}
+ date % new in v1.2f; not implemented yet...
pagetotal
url
urldate
@@ -627,6 +662,29 @@
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 % ??
+ 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
+ requestnumber % Registration number of the application to the patent document
+ publicationdate % Date of publication
+ publication % and information on the official gazette, which published patent
+ prioritydate % Information about the convention priority: the date of filing of the application,
+ prioritynumber % number and
+ prioritycountry % country name of convention priority.
+ requestdate % ??
}
{}
%<!natbib> { label }
@@ -636,7 +694,7 @@
% Declare internal variables and constants used in to format references.
% \begin{macrocode}
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon }
% \end{macrocode}
% \DescribeFunction{init.state.consts}%
@@ -648,8 +706,8 @@
#3 'after.block :=
#4 'after.dblslash :=
#5 'after.slash :=
- #6 'after.column :=
- #7 'after.semicolumn :=
+ #6 'after.colon :=
+ #7 'after.semicolon :=
}
STRINGS { s t }
@@ -686,8 +744,7 @@
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
-%<!modern> " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
-%<modern> " \BibDash " write$
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -697,10 +754,10 @@
{ "~//" * change.language * " " * write$ }
{ output.state after.slash =
{ "~/ " * write$ }
- { output.state after.column =
+ { output.state after.colon =
%<!(strict|modern)> { ": " * write$ }
%<strict|modern> { "~: " * write$ }
- { output.state after.semicolumn =
+ { output.state after.semicolon =
%<!(strict|modern)> { "; " * write$ }
%<strict|modern> { "~; " * write$ }
{ add.period$ " " * write$ }
@@ -788,22 +845,22 @@
}
% \end{macrocode}
-% \DescribeFunction{new.column}%
+% \DescribeFunction{new.colon}%
% \begin{macrocode}
-FUNCTION {new.column}
+FUNCTION {new.colon}
{ output.state before.all =
'skip$
- { after.column 'output.state := }
+ { after.colon 'output.state := }
if$
}
% \end{macrocode}
-% \DescribeFunction{new.semicolumn}%
+% \DescribeFunction{new.semicolon}%
% \begin{macrocode}
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
{ output.state before.all =
'skip$
- { after.semicolumn 'output.state := }
+ { after.semicolon 'output.state := }
if$
}
@@ -963,30 +1020,9 @@
% \end{macrocode}
%
-% \DescribeFunction{enclose.square.brackets}
-% New in v.1.2.
-% Declare function to enclose last word in square brackets. It do so only
-% for the |string| option.
-% \begin{macrocode}
-%<*!strict>
-FUNCTION {enclose.square.brackets} { }
-%</!strict>
-%<*strict>
-FUNCTION {enclose.square.brackets}
-{ duplicate$ empty$
- { pop$ "" }
- { "[" swap$ * "]" * }
- if$
-}
-%</strict>
-
-
% \DescribeFunction{bracify}
-% \DescribeFunction{bracketise}
-% \DescribeFunction{parenthesify}
% New in v.1.2. An idea borrowed from apsrev4-1.bst.
-% Declare function to enclose last word in braces, square brackets and
-% parenthesis.
+% Declare function to enclose last word by braces even if empty.
% \begin{macrocode}
FUNCTION {bracify}
{ duplicate$ empty$
@@ -994,20 +1030,30 @@
{ "{" swap$ * "}" * }
if$
}
-FUNCTION {bracketise}
-{ duplicate$ empty$
- { pop$ "[]" }
+
+% \end{macrocode}
+% \DescribeFunction{enclose.square.brackets}
+% This and the next functions are used to enclose last word by brackets.
+% \begin{macrocode}
+FUNCTION {enclose.square.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "[" swap$ * "]" * }
if$
}
-FUNCTION {parenthesify}
-{ duplicate$ empty$
- { pop$ "()" }
+
+% \end{macrocode}
+% \DescribeFunction{enclose.round.brackets}
+% \begin{macrocode}
+FUNCTION {enclose.round.brackets}
+{
+ duplicate$ empty$
+ { pop$ "" }
{ "(" swap$ * ")" * }
if$
}
-
% \end{macrocode}
%
% \DescribeFunction{space.word}
@@ -1378,6 +1424,26 @@
if$}
% \end{macrocode}
+% Next function was added in version 2016.07.07.
+% \DescribeFunction{bbl.url}
+% \begin{macrocode}
+FUNCTION {bbl.url}
+{ curlanguage "english" =
+ {"Access mode"}
+ { curlanguage "ukrainian" =
+%<!utf8> { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" }
+%<utf8> { "{Режим доступу}" }
+ { curlanguage "russian" =
+%<!utf8> { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" }
+%<utf8> { "{Режим доступа}" }
+ { curlanguage "german" =
+ { "{online; abgerufen}" }
+ { "language is not defined: " language "urldate" * * warning$ "online; accessed" }
+ if$}
+ if$}
+ if$}
+if$}
+% \end{macrocode}
% Next function was added in version 2012.01.15.
% \DescribeFunction{bbl.urldate}
% \begin{macrocode}
@@ -1509,22 +1575,22 @@
if$}
% \end{macrocode}
-% \DescribeFunction{bbl.medium.text}
+% \DescribeFunction{bbl.media.text}
% \begin{macrocode}
-FUNCTION {bbl.medium.text}
+FUNCTION {bbl.media.text}
{ curlanguage "english" =
{ "Text" }
{ curlanguage "russian" = curlanguage "ukrainian" = or
%<!utf8> { "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" }
%<utf8> { "{Текст}" }
- { "language is not defined: " language "medium" * * warning$ "Text" }
+ { "language is not defined: " language "media" * * warning$ "Text" }
if$}
if$}
% \end{macrocode}
-% \DescribeFunction{bbl.medium.elres}
+% \DescribeFunction{bbl.media.elres}
% \begin{macrocode}
-FUNCTION {bbl.medium.elres}
+FUNCTION {bbl.media.elres}
{ curlanguage "english" =
{ "Electronic resource" }
{ curlanguage "russian" =
@@ -1533,12 +1599,11 @@
{ curlanguage "ukrainian" =
%<!utf8> { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
%<utf8> { "{Електронний ресурс}" }
- { "language is not defined: " language "medium" * * warning$ "Electronic resource" }
+ { "language is not defined: " language "media" * * warning$ "Electronic resource" }
if$}
if$}
if$}
-
% \end{macrocode}
% \DescribeFunction{bbl.chief}
% \begin{macrocode}
@@ -1568,21 +1633,81 @@
{ curlanguage "ukrainian" =
%<!utf8> { "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" }
%<utf8> { "{виконавець}" }
- { "language is not defined: " language "medium" * * warning$ "Executor" }
+ { "language is not defined: " language "executor" * * warning$ "executor" }
if$}
if$}
if$}
% \end{macrocode}
-% \DescribeFunction{bbl.medium}
+% \DescribeFunction{bbl.media}
% \begin{macrocode}
-FUNCTION {bbl.medium}
+FUNCTION {bbl.media}
{ type$ "online" =
- { bbl.medium.elres }
- { bbl.medium.text }
+ { bbl.media.elres }
+ { bbl.media.text }
if$}
% \end{macrocode}
+% \DescribeFunction{bbl.req}
+% \begin{macrocode}
+FUNCTION {bbl.req}
+{
+ curlanguage "english" =
+ { "req." }
+ { curlanguage "german" =
+ { "ang." }
+ { curlanguage "russian" =
+%<!utf8> { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+%<utf8> { "{заявл.}" }
+ { "language is not defined: " language "req" * * warning$ "req" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeFunction{bbl.publ}
+% \begin{macrocode}
+FUNCTION {bbl.publ}
+{
+ curlanguage "english" =
+ { "publ." }
+ { curlanguage "german" =
+ { "ausg." }
+ { curlanguage "russian" =
+%<!utf8> { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+%<utf8> { "{опубл.}" }
+ { "language is not defined: " language "publication" * * warning$ "publication" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeFunction{bbl.priority}
+% \begin{macrocode}
+FUNCTION {bbl.priority}
+{
+ curlanguage "english" =
+ { "priority" }
+ { curlanguage "german" =
+ { "Prioritat" }
+ { curlanguage "russian" =
+%<!utf8> { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
+%<utf8> { "{приоритет}" }
+ { "language is not defined: " language "priority" * * warning$ "priority" }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+% \end{macrocode}
%
% \subsection{Formatting functions}
%
@@ -1944,7 +2069,7 @@
% \end{macrocode}
% \DescribeFunction{format.month}
-% New in version 1.2d. This macro reeads month field and translate English names
+% New in version 1.2d. This macro reads month field and translate English names
% of months to Russian if current language is Russian.
% \begin{macrocode}
FUNCTION {format.month}
@@ -2007,8 +2132,7 @@
}
{ month empty$
'year
-%<!modern> { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
-%<modern> { year ". \BibDash " format.month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -2027,7 +2151,7 @@
{ address output
publisher empty$
'skip$
- { new.column }
+ { new.colon }
if$
}
if$
@@ -2035,28 +2159,6 @@
}
%</!strict>
%<*strict>
-%FUNCTION {output.address.publisher}
-%{
-% address empty$
-% {
-% bbl.nnoaddress
-% publisher empty$
-% { "~: " * bbl.nopublisher * }
-% { }
-% if$
-% enclose.square.brackets
-% }
-% {
-% address output
-% new.column
-% publisher empty$
-% { bbl.nopublisher enclose.square.brackets }
-% { publisher }
-% if$
-% }
-% if$
-% output
-%}
FUNCTION {output.address.publisher}
{
address empty$
@@ -2069,7 +2171,7 @@
}
{
address output
- new.column
+ new.colon
publisher empty$
{ bbl.nopublisher enclose.square.brackets }
{ publisher }
@@ -2098,20 +2200,6 @@
% \DescribeFunction{output.bibitem}
% \begin{macrocode}
%<*!natbib>
-%%FUNCTION {output.bibitem}
-%%{ newline$
-%% "\bibitem" write$
-%% cite$ bracify write$
-%% newline$
-%% language empty$
-%% { "english" 'curlanguage := }
-%% { language 'curlanguage := }
-%% if$
-%% "\selectlanguageifdefined" curlanguage bracify * write$
-%% newline$
-%% ""
-%% before.all 'output.state :=
-%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
@@ -2791,7 +2879,7 @@
author empty$
'skip$
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
%</!modern>
@@ -2803,7 +2891,7 @@
'skip$
{author num.names$ #3 >
{format.authors.after output
- new.semicolumn }
+ new.semicolon }
'skip$
if$}
if$
@@ -2824,7 +2912,7 @@
bookauthor empty$
'skip$
{format.bookauthors.after output
- new.semicolumn }
+ new.semicolon }
if$
}
@@ -2836,19 +2924,19 @@
compiler empty$
{}
{ format.compiler.after output
- new.semicolumn
+ new.semicolon
}
if$
editor empty$
{}
{ format.editors.after output
- new.semicolumn
+ new.semicolon
}
if$
organization empty$
{}
{organization output
- new.semicolumn
+ new.semicolon
}
if$
}
@@ -2861,7 +2949,7 @@
{ "" }
{
%<!(modern|strict)> "\BibUrl{ " url * "}" *
-%<modern|strict> "URL: \BibUrl{" url * "}" *
+%<modern|strict> bbl.url ": \BibUrl{" * url * "}" *
urldate empty$
{ "" }
{ " (" bbl.urldate * ": " * urldate * ")" * }
@@ -2871,6 +2959,17 @@
}
% \end{macrocode}
+% \DescribeFunction{output.url}
+% \begin{macrocode}
+FUNCTION {output.url}
+{
+ url empty$
+ 'skip$
+ { format.url output }
+ if$
+}
+
+% \end{macrocode}
% \DescribeFunction{format.annote}
% \begin{macrocode}
FUNCTION {format.annote}
@@ -2929,21 +3028,21 @@
%</!eprint>
% \end{macrocode}
-% \DescribeFunction{add.medium}
-% New in version 2.
+% \DescribeFunction{add.media}
+% New in version 2. Adds media field if |strict| options is in effect.
% \begin{macrocode}
%<*!strict>
-FUNCTION {add.medium} { }
+FUNCTION {add.media} { }
%</!strict>
%<*strict>
-FUNCTION {add.medium}
+FUNCTION {add.media}
{ duplicate$ empty$
'skip$
- { medium empty$
- { " " * bbl.medium enclose.square.brackets * }
- { " " * medium enclose.square.brackets * }
-%% { bbl.medium enclose.square.brackets * }
-%% { medium enclose.square.brackets * }
+ { media empty$
+ { " " * bbl.media enclose.square.brackets * }
+ { " " * media enclose.square.brackets * }
+%% { bbl.media enclose.square.brackets * }
+%% { media enclose.square.brackets * }
if$
}
if$
@@ -3052,6 +3151,65 @@
% \end{macrocode}
%
+% Functions added in v1.2f to format patent entry (thanks to Stanislav Kruchinin).
+%
+% \DescribeFunction{add.number}
+% \begin{macrocode}
+FUNCTION {add.number}
+{ duplicate$ empty$
+ { "" }
+ { bbl.nr swap$ tie.or.space.connect }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeFunction{format.type.number}
+% \begin{macrocode}
+FUNCTION {format.type.number}
+{
+ type empty$
+ { "" }
+ {
+ number empty$
+ { "" }
+ { type number tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeFunction{format.requestdate}
+% \begin{macrocode}
+FUNCTION {format.requestdate}
+{ requestdate empty$
+ { "" }
+ { bbl.req requestdate tie.or.space.connect }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeFunction{format.publicationdate}
+% \begin{macrocode}
+FUNCTION {format.publicationdate}
+{ publicationdate empty$
+ { "" }
+ { bbl.publ publicationdate tie.or.space.connect }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeFunction{format.prioritydate}
+% \begin{macrocode}
+FUNCTION {format.prioritydate}
+{ prioritydate empty$
+ { "" }
+ { bbl.priority prioritydate tie.or.space.connect }
+ if$
+}
+
+% \end{macrocode}
+%
% \subsection{Entry types}
%
% Text below in this section is borrowed from biblatex manual. Not every
@@ -3094,7 +3252,7 @@
output.bibitem
author.before
%<natbib> author format.key output
- format.title add.medium "title" output.check
+ format.title add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -3135,7 +3293,7 @@
output.bibitem
author.before
%<natbib> author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -3179,7 +3337,7 @@
output.bibitem
author.before
%<natbib> author format.key output
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
editor.organization.after
@@ -3215,7 +3373,7 @@
output.bibitem
author.before
%<natbib> author format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -3267,7 +3425,7 @@
author.before
%<natbib> author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -3310,7 +3468,7 @@
{
output.bibitem
%<natbib> editor format.key output
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
new.slash
editor.organization.after
new.block
@@ -3355,7 +3513,7 @@
author.before
%<natbib> author format.key output
new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
new.slash
author.after
new.dblslash
@@ -3371,7 +3529,7 @@
% format.date "year" output.check
% }
% { address output.nonnull
-% new.column
+% new.colon
% publisher output
% format.date "year" output.check
% }
@@ -3415,7 +3573,7 @@
if$
%<natbib> author format.key output
new.block
- format.btitle add.doi add.medium "title" output.check
+ format.btitle add.doi add.media "title" output.check
author empty$
{ organization empty$
{
@@ -3443,6 +3601,63 @@
}
% \end{macrocode}
+% \DescribeFunction{patent}
+% A patent or patent request. The number or record token is given in the number
+% field. Use the |type| field to specify the type and the |location| field to
+% indicate the scope of the patent, if different from the scope implied by the
+% type. Note that the location field is treated as a key list with this entry
+% type.
+%
+% Required fields: author, title, number, year/date.
+%
+% Optional fields: holder, subtitle, titleaddon, type, version, location, note,
+% date, month, year, addendum, pubstate, doi, eprint, eprint class, eprint type,
+% url, urldate.
+% \begin{macrocode}
+FUNCTION {patent}
+{
+ output.bibitem
+% title output.nonnull
+ title add.media output.nonnull
+% add.blank
+% media enclose.square.brackets output % S.Kruchinin's version
+ new.colon
+ format.type.number output
+ add.blank
+ location output
+ new.colon
+ ipc output
+ new.slash
+ format.authors.after "author" output.check
+ add.blank
+ authorcountry enclose.round.brackets output.nonnull
+%<natbib> author format.key output
+ new.semicolon
+ holder output.nonnull
+ new.semicolon
+ credits output.nonnull
+ new.block
+ requestnumber add.number output
+ new.semicolon
+ format.requestdate output
+ new.semicolon
+ format.publicationdate output
+ publication output
+ new.semicolon
+ format.prioritydate output
+ prioritynumber output
+ prioritycountry enclose.round.brackets output
+ new.block
+ note output
+ new.sentence
+ output.url
+ format.annote output
+ new.block
+ pagetotal output
+ fin.entry
+}
+
+% \end{macrocode}
% \DescribeFunction{misc}
% A fallback type for entries which do not fit into any other category. Use the field
% howpublished to supply publishing information in free format, if applicable. The
@@ -3455,7 +3670,7 @@
format.authors output
%<natbib> author format.key output
title howpublished new.sentence.checkb
- format.title add.medium output
+ format.title add.media output
howpublished new.block.checka
howpublished output
new.block
@@ -3517,10 +3732,11 @@
format.authors output
%<natbib> author format.key output
title howpublished new.sentence.checkb
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
% howpublished new.block.checka
howpublished new.dblslash.checka
- howpublished enclose.square.brackets output
+%<!strict> howpublished output
+%<strict> howpublished enclose.square.brackets output
editor.organization.after
new.sentence
new.block
@@ -3569,7 +3785,7 @@
%<natbib> author format.key output
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -3590,15 +3806,15 @@
format.authors "author" output.check
%<natbib> author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
% bbl.phdthesis format.thesis.type output.nonnull
type "type" output.check
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -3635,8 +3851,8 @@
% output.bibitem
% author.before
% new.sentence
-% format.title add.doi add.medium "title" output.check
-% new.column
+% format.title add.doi add.media "title" output.check
+% new.colon
%% format.techrep.type.number output.nonnull
% type "type" output.check
% new.slash
@@ -3644,7 +3860,7 @@
% editor.organization.after
% new.block
% address output
-% new.column
+% new.colon
% institution "institution" output.check
% format.date "year" output.check
% new.block
@@ -3662,24 +3878,24 @@
output.bibitem
% author.before
% new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
%<natbib> title format.key output
- new.column
+ new.colon
% format.techrep.type.number output.nonnull
% type "type" output.check
% format.report.type.number "type" output.check
type "type" output.check
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
@@ -3711,7 +3927,7 @@
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -3732,14 +3948,14 @@
format.authors "author" output.check
%<natbib> author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.phdthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -3768,7 +3984,7 @@
%<natbib> author format.key output
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -3789,14 +4005,14 @@
format.authors "author" output.check
%<natbib> author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.mthesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -3825,7 +4041,7 @@
%<natbib> author format.key output
new.sentence
format.btitle "title" output.check
- new.column
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
new.slash
school "school" output.check
@@ -3846,14 +4062,14 @@
format.authors "author" output.check
%<natbib> author format.key output
new.sentence
- format.btitle add.doi add.medium "title" output.check
- new.column
+ format.btitle add.doi add.media "title" output.check
+ new.colon
bbl.dscithesis format.thesis.type output.nonnull
- new.column
+ new.colon
number output
new.slash
format.authors.after output
- new.semicolumn
+ new.semicolon
school "school" output.check
new.block
output.address.publisher
@@ -3887,8 +4103,8 @@
% output.bibitem
% author.before
% new.sentence
-% format.title add.doi add.medium "title" output.check
-% new.column
+% format.title add.doi add.media "title" output.check
+% new.colon
% format.techrep.type.number output.nonnull
% new.slash
% author.after
@@ -3895,7 +4111,7 @@
% editor.organization.after
% new.block
% address output
-% new.column
+% new.colon
% institution "institution" output.check
% format.date "year" output.check
% new.block
@@ -3914,25 +4130,25 @@
output.bibitem
% author.before
% new.sentence
- format.title add.doi add.medium "title" output.check
+ format.title add.doi add.media "title" output.check
%<natbib> title format.key output
- new.column
+ new.colon
% format.techrep.type.number output.nonnull
% type "type" output.check
% format.report.type.number "type" output.check
% type output
format.techreport.type output
- new.column
+ new.colon
number output
new.slash
institution "institution" output.check
- new.semicolumn
+ new.semicolon
format.chief.after output % from editor field
- new.semicolumn
+ new.semicolon
format.executor.after output % from author field
new.block
address output
- new.column
+ new.colon
organization output
format.date "year" output.check
new.block % v.2
Modified: trunk/Master/texmf-dist/source/bibtex/gost/gost.ins
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/gost/gost.ins 2016-07-30 23:12:58 UTC (rev 41777)
+++ trunk/Master/texmf-dist/source/bibtex/gost/gost.ins 2016-07-30 23:13:20 UTC (rev 41778)
@@ -15,7 +15,7 @@
This file has the LPPL maintenance status "maintained".
Maintained by Igor A. Kotelnikov.
-Current version: 1.2d, 2016.02.18
+Current version: 1.2g, 2016.07.25
Please, send bug report via e-mail:
kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,7 +49,7 @@
%
\file{gost2008s.bst} {\from{gost.dtx} {bst,modern,eprint,sort}}
\file{gost2008ls.bst} {\from{gost.dtx} {bst,modern,eprint,long,sort}}
-%
+% `
% -----------------------------------------------------------------------------------------
% Unicode BST styles that mimics obsolete version of GOST 7.8.0 for bibliographic *records*
% \file{ugost780.bst} {\from{gost.dtx} {bst,utf8}}
More information about the tex-live-commits
mailing list