gost (14jan17)

git-svn-id: svn://tug.org/texlive/trunk@42974 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 134 insertions, 51 deletions

diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
index 13f1c7877d9..6b37bab8ee4 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
 %% GOST 7.0.5-2008 for bibliographic reference.
@@ -46,43 +45,47 @@ ENTRY
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -633,7 +636,7 @@ FUNCTION {bbl.techreport} % rename to bbl.techreport
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -651,7 +654,7 @@ FUNCTION {bbl.phdthesis}
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ кандидата наук}" }
+         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -660,18 +663,31 @@ FUNCTION {bbl.phdthesis}
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -708,7 +724,7 @@ FUNCTION {bbl.media.text}
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -720,6 +736,18 @@ FUNCTION {bbl.media.elres}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -745,9 +773,12 @@ FUNCTION {bbl.executor}
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -988,11 +1019,34 @@ FUNCTION {format.date}
   if$
 }
 
-FUNCTION {output.address.publisher}
+FUNCTION {address.or.location}
 {
   address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
+FUNCTION {output.address.publisher}
+{
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1274,15 +1328,16 @@ FUNCTION {empty.misc.check}
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1424,7 +1479,16 @@ FUNCTION {add.doi}
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1561,7 +1625,7 @@ FUNCTION {booklet}
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1724,7 +1788,7 @@ FUNCTION {patent}
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1820,13 +1884,18 @@ FUNCTION {thesis}
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1851,13 +1920,14 @@ FUNCTION {report}
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1879,11 +1949,15 @@ FUNCTION {phdthesis}
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1897,19 +1971,23 @@ FUNCTION {phdthesis}
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1923,19 +2001,23 @@ FUNCTION {masterthesis}
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1962,13 +2044,14 @@ FUNCTION {techreport}
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check