texlive[42974] Master/texmf-dist: gost (14jan17)

commits+karl at tug.org commits+karl at tug.org
Tue Jan 17 00:13:29 CET 2017


Revision: 42974
          http://tug.org/svn/texlive?view=revision&revision=42974
Author:   karl
Date:     2017-01-17 00:13:28 +0100 (Tue, 17 Jan 2017)
Log Message:
-----------
gost (14jan17)

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/doc/examples/utf8/bib/ex01.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex01.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex02.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex03.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex04.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex05.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex06.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex06a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex07.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex08.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex09.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex10.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex11.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex12.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex13.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex14.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex14a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex15.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex16.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex17.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex17a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex17b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex18.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex19.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex20.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex20a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex20b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex20c.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex21.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex21a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex22.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex23.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex24.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex24a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex24b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex25.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex26.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex27a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex27b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex27c.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex28.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex29.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex30.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex31.bib
    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/gost.tex
    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.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/ugost.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex
    trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx
    trunk/Master/texmf-dist/source/bibtex/gost/gost.ins

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/bibtex/gost/README.md
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex21b.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex22a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/ex28a.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd
    trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.tex

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/bibtex/gost/README
    trunk/Master/texmf-dist/doc/bibtex/gost/dobib.cmd
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd
    trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/gost2008-natbib-s.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/donat.cmd
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.pdf
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost780._tex
    trunk/Master/texmf-dist/doc/bibtex/gost/ugost780.pdf
    trunk/Master/texmf-dist/tex/latex/gost/

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2003.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
 
 ENTRY
   { address
@@ -46,43 +45,47 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -653,8 +656,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -712,18 +728,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -749,9 +781,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -933,7 +968,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -963,6 +998,29 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
   address empty$
@@ -1258,15 +1316,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1409,10 +1468,8 @@
 { duplicate$ empty$
     'skip$
     { media empty$
+        { " " * bbl.media.text enclose.square.brackets * }
         { " " * bbl.media enclose.square.brackets * }
-        { " " * media enclose.square.brackets * }
-%%        { bbl.media enclose.square.brackets * }
-%%        { media enclose.square.brackets * }
       if$
     }
   if$
@@ -1553,7 +1610,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1716,7 +1773,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1812,13 +1869,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1843,13 +1905,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1871,11 +1934,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1889,19 +1956,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1915,19 +1986,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1954,13 +2029,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
 
 ENTRY
   { address
@@ -46,43 +45,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -663,8 +666,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -722,18 +738,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -759,9 +791,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -943,7 +978,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -973,6 +1008,29 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
   address empty$
@@ -1268,15 +1326,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1419,10 +1478,8 @@
 { duplicate$ empty$
     'skip$
     { media empty$
+        { " " * bbl.media.text enclose.square.brackets * }
         { " " * bbl.media enclose.square.brackets * }
-        { " " * media enclose.square.brackets * }
-%%        { bbl.media enclose.square.brackets * }
-%%        { media enclose.square.brackets * }
       if$
     }
   if$
@@ -1563,7 +1620,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1726,7 +1783,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1822,13 +1879,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1853,13 +1915,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1881,11 +1944,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1899,19 +1966,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1925,19 +1996,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1964,13 +2039,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -653,8 +656,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -712,18 +728,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -749,9 +781,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -963,7 +998,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -993,11 +1028,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1279,15 +1337,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1429,7 +1488,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1566,7 +1634,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1729,7 +1797,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1825,13 +1893,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1856,13 +1929,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1884,11 +1958,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1902,19 +1980,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1928,19 +2010,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1967,13 +2053,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -653,8 +656,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -712,18 +728,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -749,9 +781,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -963,7 +998,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -993,11 +1028,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1279,15 +1337,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1417,7 +1476,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1554,7 +1622,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1717,7 +1785,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1813,13 +1881,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1844,13 +1917,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1872,11 +1946,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1890,19 +1968,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1916,19 +1998,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1955,13 +2041,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -663,8 +666,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -722,18 +738,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -759,9 +791,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -973,7 +1008,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -1003,11 +1038,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1289,15 +1347,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1427,7 +1486,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1564,7 +1632,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1727,7 +1795,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1823,13 +1891,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1854,13 +1927,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1882,11 +1956,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1900,19 +1978,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1926,19 +2008,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1965,13 +2051,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
 %% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -703,8 +706,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -713,19 +716,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -762,18 +778,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -799,9 +831,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -1132,7 +1167,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -1163,11 +1198,34 @@
   extra.label * % new in v.1.2
 }
 
+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$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1542,15 +1600,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1692,7 +1751,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1832,7 +1900,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -2000,7 +2068,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -2101,13 +2169,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2133,13 +2206,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -2162,11 +2236,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2180,7 +2258,7 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2187,13 +2265,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2207,7 +2289,7 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2214,13 +2296,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2248,13 +2334,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
 %% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -703,8 +706,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -713,19 +716,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -762,18 +778,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -799,9 +831,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -1132,7 +1167,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -1163,11 +1198,34 @@
   extra.label * % new in v.1.2
 }
 
+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$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1542,15 +1600,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1692,7 +1751,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1832,7 +1900,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -2000,7 +2068,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -2101,13 +2169,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2133,13 +2206,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -2162,11 +2236,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2180,7 +2258,7 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2187,13 +2265,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2207,7 +2289,7 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2214,13 +2296,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2248,13 +2334,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -663,8 +666,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -722,18 +738,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -759,9 +791,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -973,7 +1008,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -1003,11 +1038,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1289,15 +1347,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1439,7 +1498,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1576,7 +1644,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1739,7 +1807,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1835,13 +1903,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1866,13 +1939,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1894,11 +1968,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1912,19 +1990,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1938,19 +2020,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1977,13 +2063,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost780.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
 
 ENTRY
   { address
@@ -46,43 +45,47 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -653,8 +656,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -663,19 +666,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -712,18 +728,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -749,9 +781,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -933,7 +968,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -963,11 +998,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1254,15 +1312,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1392,7 +1451,16 @@
 
 FUNCTION {add.doi} { }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 FUNCTION {output.eprint.url}
@@ -1502,7 +1570,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1663,7 +1731,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1761,7 +1829,8 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1784,13 +1853,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1812,7 +1882,8 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1824,15 +1895,16 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1844,15 +1916,16 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1877,13 +1950,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/gost780s.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
 
 ENTRY
   { address
@@ -46,43 +45,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -663,8 +666,8 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+           "\cyrn\cyra\cyru\cyrk}" * }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -673,19 +676,32 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+           "\cyrn\cyra\cyru\cyrk}" * }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type "t" change.case$ }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -722,18 +738,34 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
       { curlanguage "ukrainian" =
-        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+      { curlanguage "ukrainian" =
+        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -759,9 +791,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -943,7 +978,7 @@
         { month "Aug." =
             { "\CYRA\cyrv\cyrg\." }
         { month "Sep." =
-            { "\CYRS\cyre\cyn\cyrt." }
+            { "\CYRS\cyre\cyrn\cyrt." }
         { month "Oct." =
             { "\CYRO\cyrk\cyrt." }
         { month "Nov." =
@@ -973,11 +1008,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1264,15 +1322,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type "t" change.case$
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1402,7 +1461,16 @@
 
 FUNCTION {add.doi} { }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 FUNCTION {output.eprint.url}
@@ -1512,7 +1580,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1673,7 +1741,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1771,7 +1839,8 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1794,13 +1863,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1822,7 +1892,8 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1834,15 +1905,16 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1854,15 +1926,16 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -1887,13 +1960,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
 
 ENTRY
   { address
@@ -46,43 +45,47 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -651,7 +654,7 @@
    { 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 @@
    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 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -720,6 +736,18 @@
    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 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -958,6 +989,29 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
   address empty$
@@ -1253,15 +1307,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1404,10 +1459,8 @@
 { duplicate$ empty$
     'skip$
     { media empty$
+        { " " * bbl.media.text enclose.square.brackets * }
         { " " * bbl.media enclose.square.brackets * }
-        { " " * media enclose.square.brackets * }
-%%        { bbl.media enclose.square.brackets * }
-%%        { media enclose.square.brackets * }
       if$
     }
   if$
@@ -1548,7 +1601,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1711,7 +1764,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1807,13 +1860,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1838,13 +1896,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1866,11 +1925,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1884,19 +1947,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1910,19 +1977,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1949,13 +2020,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,10 +27,9 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
-%% GOST 7.80-2000 for bibliographic records.
+%% GOST 7.1-2003 for bibliographic records.
 
 ENTRY
   { address
@@ -46,43 +45,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -661,7 +664,7 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ кандидата наук}" }
+         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -670,18 +673,31 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -718,7 +734,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -730,6 +746,18 @@
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -755,9 +783,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -968,6 +999,29 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
   address empty$
@@ -1263,15 +1317,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1414,10 +1469,8 @@
 { duplicate$ empty$
     'skip$
     { media empty$
+        { " " * bbl.media.text enclose.square.brackets * }
         { " " * bbl.media enclose.square.brackets * }
-        { " " * media enclose.square.brackets * }
-%%        { bbl.media enclose.square.brackets * }
-%%        { media enclose.square.brackets * }
       if$
     }
   if$
@@ -1558,7 +1611,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1721,7 +1774,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1817,13 +1870,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1848,13 +1906,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1876,11 +1935,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1894,19 +1957,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1920,19 +1987,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1959,13 +2030,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -651,7 +654,7 @@
    { 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 @@
    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 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -720,6 +736,18 @@
    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 @@
 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 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1274,15 +1328,16 @@
   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 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1561,7 +1625,7 @@
   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 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1820,13 +1884,18 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     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 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -651,7 +654,7 @@
    { 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 @@
    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 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -720,6 +736,18 @@
    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 @@
 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 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1274,15 +1328,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1412,7 +1467,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1549,7 +1613,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1712,7 +1776,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1808,13 +1872,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1839,13 +1908,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1867,11 +1937,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1885,19 +1959,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1911,19 +1989,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1950,13 +2032,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -661,7 +664,7 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ кандидата наук}" }
+         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -670,18 +673,31 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -718,7 +734,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -730,6 +746,18 @@
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -755,9 +783,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -998,11 +1029,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1284,15 +1338,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1434,7 +1489,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1571,7 +1635,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1734,7 +1798,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1830,13 +1894,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1861,13 +1930,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1889,11 +1959,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1907,19 +1981,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1933,19 +2011,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1972,13 +2054,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
 %% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -701,7 +704,7 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ кандидата наук}" }
+         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -710,18 +713,31 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -758,7 +774,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -770,6 +786,18 @@
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -795,9 +823,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -1158,11 +1189,34 @@
   extra.label * % new in v.1.2
 }
 
+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$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1537,15 +1591,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1687,7 +1742,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1827,7 +1891,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1995,7 +2059,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -2096,13 +2160,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2128,13 +2197,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -2157,11 +2227,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2175,7 +2249,7 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2182,13 +2256,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2202,7 +2280,7 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2209,13 +2287,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2243,13 +2325,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -17,7 +17,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %% Maintained by Igor A. Kotelnikov.
 %% 
-%% Current version: 1.2h, 2016.09.21
+%% Current version: 1.2j, 2017.01.12
 %% 
 %% Please, send bug report via e-mail:
 %%   kia999 at mail dot ru <Igor Kotelnikov>
@@ -27,7 +27,6 @@
 
 
 
-
 %%
 %% This bibstyle attempts to format bibliography according to
 %% GOST 7.0.5-2008 for bibliographic reference.
@@ -72,43 +71,47 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -683,7 +686,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -701,7 +704,7 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ кандидата наук}" }
+         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -710,18 +713,31 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -758,7 +774,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -770,6 +786,18 @@
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -795,9 +823,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -1158,11 +1189,34 @@
   extra.label * % new in v.1.2
 }
 
+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$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1537,15 +1591,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1687,7 +1742,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1827,7 +1891,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1995,7 +2059,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -2096,13 +2160,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2128,13 +2197,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -2157,11 +2227,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2175,7 +2249,7 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2182,13 +2256,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2202,7 +2280,7 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   author format.key output
@@ -2209,13 +2287,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -2243,13 +2325,14 @@
   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

Modified: trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst	2017-01-16 23:13:28 UTC (rev 42974)
@@ -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 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -643,7 +646,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -661,7 +664,7 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ кандидата наук}" }
+         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -670,18 +673,31 @@
    if$}
 if$}
 
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+      { type }
+    if$}
+  if$}
+if$}
+
 FUNCTION {bbl.nnoaddress}
 { curlanguage "english" =
    { "S.\ l." }
@@ -718,7 +734,7 @@
    if$}
 if$}
 
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
@@ -730,6 +746,18 @@
    if$}
 if$}
 
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
 FUNCTION {bbl.chief}
 { curlanguage "english" =
    { "chief" }
@@ -755,9 +783,12 @@
 if$}
 
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 FUNCTION {bbl.req}
@@ -998,11 +1029,34 @@
   if$
 }
 
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -1284,15 +1338,16 @@
   if$
 }
 
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-      type
+      bbl.thesis.type
     }
   if$
 }
-
 %%<!utf8>    { "t" change.case$ }
 %%<utf8>    { "" }
 
@@ -1434,7 +1489,16 @@
   if$
 }
 
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 
 
 
@@ -1571,7 +1635,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -1734,7 +1798,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -1830,13 +1894,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1861,13 +1930,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -1889,11 +1959,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1907,19 +1981,23 @@
   fin.entry
 }
 
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1933,19 +2011,23 @@
   fin.entry
 }
 
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -1972,13 +2054,14 @@
   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

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/README
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/README	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/README	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,303 +0,0 @@
-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.
-
-It 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.
-
-The System of Standards includes:
-GOST 7.0.5-2008  Bibliographic reference.
-                 General requirements and rules of making.
-GOST 7.1  -2003  Bibliographic record.
-                 Bibliographic description.
-                 General requirements and rules.
-GOST 7.80 -2000  Bibliographic record.
-                 Heading. General requirements and rules.
-GOST 7.11 -2004  Bibliographic description and references.
-                 Rules for the abbreviation of words and word combinations
-                 in foreign European languages.
-GOST 7.83 -2001  Electronic editions. Basic types and imprint.
-Ect.
-
-GOST comprises 16 BibTeX styles to format bibliography in English, Russian
-and Ukrainian according to GOST 7.0.5-2008 and GOST 7.1-2003. Both 8-bit
-and Unicode (UTF-8) versions of each BibTeX style, in each case offering
-a choice of sorted and unsorted. Further, 2 more styles, |gost780| and
-|gost780s| styles (not conforming to effective standards) are retained
-for backwards compatibility.
-
-All BibTeX styles are derived from same master file |gost.dtx| by applying
-different set of options as shown in the table below.
-
-------------------------------------------------------------------------
- Style         | utf8 | strict | modern | eprint | long | sort | natbib
-------------------------------------------------------------------------
- gost780       |      |        |        |        |      |      |
- gost780s      |      |        |        |        |      |   +  |
-------------------------------------------------------------------------
- gost2003      |      |   +    |        |    +   |      |      |
- gost2003s     |      |   +    |        |    +   |      |   +  |
- gost2008      |      |        |   +    |    +   |      |      |
- gost2008n     |      |        |   +    |    +   |      |      |   +
- gost2008l     |      |        |   +    |    +   |   +  |      |
- gost2008s     |      |        |   +    |    +   |      |   +  |
- gost2008ns    |      |        |   +    |    +   |      |   +  |   +
- gost2008ls    |      |        |   +    |    +   |   +  |   +  |
-------------------------------------------------------------------------
- ugost2003     |  +   |   +    |        |    +   |      |      |
- ugost2003s    |  +   |   +    |        |    +   |      |   +  |
- ugost2008     |  +   |        |   +    |    +   |      |      |
- ugost2008n    |  +   |        |   +    |    +   |      |      |   +
- ugost2008l    |  +   |        |   +    |    +   |   +  |      |
- ugost2008s    |  +   |        |   +    |    +   |      |   +  |
- ugost2008ns   |  +   |        |   +    |    +   |      |   +  |   +
- ugost2008ls   |  +   |        |   +    |    +   |   +  |   +  |
-------------------------------------------------------------------------
- Style         | utf8 | strict | modern | eprint | long | sort | natbib
-------------------------------------------------------------------------
-
-|Gost2008| style is recommended for most applications. It corresponds to the
-currently effective Standard 7.0.5-2008. Librarians should use the style
-|gost2003| instead of |gost2008| to compile a library catalog to meet the
-Standard 7.1-2003. Use of other styles is best explained through
-the meaning of options used to compile those styles from the master source.
-
-Two styles, |gost780| and |gost780s|, generated without |modern| and
-|strict| options, are retained for backward compatibility. They do not
-conform the Standards 7.0.5-2008 and 7.1-2003 cited above.
-
-The |strict| option provides conformance to the Standard 7.1-2003. The
-styles compiled with that option bear the name |gost2003| with possible
-suffixes |s|, |l|, |n| as explained below. These styles are intended
-primarily for the librarians who compose a library catalog.
-
-The |modern| option meets the Standard 7.0.5-2008 which can be thought
-off as a relaxed version of the Standard 7.1-2003. The styles compiled with
-that option bear the name |gost2008| with possible suffixes |s|, |l|, |n|.
-The |strict| option  has precedence over |modern| so that a style compiled
-with both options will resemble mainly the |gost2003| style rather than
-|gost2008|.
-
-If the number of authors exceeds 4, modern styles cut the list of authors
-to at most 4 persons as prescibed by the Standards. The option
-|long| overrides this rule to provide backward compatibility with the
-package disser by Stanislab Kruchinin. Two styles, |gost2008l| and
-|gost2008ls|, compiled with the option |long| mimic behavior of the styles
-|gost705| and |gost705s| from the disser package. Major
-effect of the |long| option is that the list of authors always
-precedes book or article title no matter how long is it.
-Modern styles compiled without |long| place long list of authors behind
-the title. The names of styles compiled with the option |long| has the
-suffix |l|. Recall that those styles do not conform effective Standards and
-their use is discouraged.
-
-The |eprint| option enables formatting electronic publications. In particular,
-it enables |eprint|, |eprinttype|, |eprintclass|, and |doi| fields for a
-bibliographic entry. The styles, generated without the |eprint| option,
-just ignore these fields. Starting from the version 1.2 of the GOST package, 
-all modern styles are compiled with this option included, and therefore the 
-suffix |e| which designated this option in earlier  versions is not appended 
-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
-4 styles with that option are available for public use.
-
-The |sort| option enables sorting bibliographic references by author names
-and titles of references. The names of styles compiled with the option |sort|
-bear the suffix |s|. Sorting does not work as expected for databases in
-unicode encoding (see below).
-
-Finally, the |utf8| option produces bibliographic styles in unicode rather
-that in 8-bit encoding. Names of those styles bear the prefix |u|.
-
-
-Beyond bibliographic style, GOST bundle contains CS files (codepage and
-sorting order).
-
-----------------------------------------------------------------
- Encoding        |   CSF                 Sorting order
-----------------------------------------------------------------
- cp866           |   ruscii.csf          Cyrillic first, Latin
- cp1251          |   cp1251.csf          Cyrillic first, Latin
- koi8-u          |   koi8u.csf           Cyrillic first, Latin
- utf8            |   utf8cyrillic.csf    Cyrillic first, Latin
-----------------------------------------------------------------
-
-In addition, BibTeX8 distribution comes with few more CSFs.
-
-----------------------------------------------------------------
- Encoding        |   CSF                 Sorting order
-----------------------------------------------------------------
- cp866           |   cp866rus.csf        Latin first, Cyrillic
-----------------------------------------------------------------
-
-
-How to use
-
-1. Select bibliography style by adding appropriate \bibliographystyle
-   declaration to your source file <filename>.tex, e.g.
-
-	\bibliographystyle{gost2008}
-	\bibliography{database}
-
-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 partially supported.
-
-3. To compile list of references from your database use bibtex8.exe
-   rather than bibtex.exe. Depending on the codepage of your
-   bibliographic database, indicate one of the CS files
-   listed above as option to bibtex8.exe.  Run LaTeX, then run
-   bibTeX8 and again LaTeX:
-
-   	latex <filename>.tex
-   	bibtex8 -B -c <csf_file>.csf <filename>.aux
-	latex <filename>.tex
-
-4. For details on preparing bibliographic database see
-   examples in |gost*.pdf|.
-
-5. Ugost*.bst styles are primarily intended for use
-   with unicode compilers (xelatex and lualatex). They
-   should be preferred as well when using 8bit compilers
-   (latex and pdflatex) if source file is in utf8 encoding.
-
-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.
-
-7. Bibtex8 fails to change case of a string if it contains Cyrillic
-   letter in unicode. Therefore ugost2008* styles do not change case of
-   titles and other parts of bibliographic record while 8-bit styles
-   do the case change where appropriate.
-
-8. Either |bibtex8| or |Bibtex8| fail to cut Cyrillic names to
-   initials. Therefore |ugost2008*| styles do not modify the name of
-   authors.
-
-9. Package |natbib| should be loaded when using styles with
-   suffix |n| in their names.
-
-
-Customization
-
-Every GOST style defines few commands to format some parts of a
-reference. You can redefine these commands prior to
-the \bibliography{<bibtex_style>} command. Initial
-definitions are listed below.
-
-	\providecommand*{\url}[1]{{\small #1}}
-	\providecommand*{\BibUrl}[1]{\url{#1}}
-	\providecommand{\BibAnnote}[1]{}
-	\providecommand*{\BibEmph}[1]{#1}
-
-By default, gost styles separate logical parts of a bibliography
-record by a period and cyrdash (. "---). It is legitimate to drop
-that dash by overriding the command \BibDash as follows
-
-	\providecommand*{\BibDash}{}
-
-By default, \BibDash is equivalent to the shorthand "---
-introduced by the babel package with the option russian.
-It prints a so called Cyrillic dash (\cyrdash), which is
-20% shorter than ordinary LaTeX dash (---), and puts
-unbreakable space before \cyrdash so that the dash never
-appears at the beginning of a line.
-
-
-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.2h (2016.09.21)
-
-1. Minor changes in documentation.
-
-
-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;
-2. New macro format.month.
-3. \cyrdash is now faked via \ProvideTextCommandDefault if not defined.
-
-
-What's new in version 1.2c (2015.01.10)
-
-1. langid field added; language field supported for backward compatibility.
-2. eid field added, it has priority over pages field;
-3. Fix Gost2003: "--- replaced by \BibDash;
-4. Spacing around \BibDash improved.
-
-
-What's new in version 1.2b (2014.01.19)
-
-1. numpages renamed to pagetotal.
-
-
-What's new in version 1.2a (2012.08.31)
-
-1. \cyrdash is now defined via \ProvideTextCommand rather than \providecommand.
-
-
-What's new in version 1.2 (2012.02.22)
-
-1. Code refactoring. All styles are now generated from single source file.
-2. Support for GOST-7.1-2003. The field |medium| is added to reflect type
-   of material. For most entry types |medium| defaults to |text|.
-3. Support for |natbib| package.
-4. All modern styles are now compiled with the |eprint| option.
-
-
-What's new in version 1.1 (2012.01.21)
-
-1. Support for GOST 7.0.5-2008 and GOST 7.1-2003 is provided.
-2. |@Online| entry is added to format a reference to electronic
-   resource on Internet.
-3. |@MastersThesis| entry is added to format a reference to master's thesis.
-   |@DSciThesis| entry is added to format a reference to doctor of
-   sciences thesis.
-4. |Urldate|, |eprint|, |eprintclass|, |eprinttype| fields are added.
-
-
-Version history
-
-2012.08.31 \cyrdash is now defined via \ProvideTextCommand.
-2012.02.22 Support for |natbib| package.
-2012.02.02 Adaptation to GOST 7.0.5, electronic publishing.
-2005.08.12 First version uploaded to CTAN.
-2003.06.06 First public version.
-
-
-
-Please, send feature requests and bug reports via e-mail:
-  kia999  at mail  dot ru   <Igor A. Kotelnikov>
-or
-  polyama at yahoo dot com  <Maksym Polyakov>
-
-Happy BibTeXing!

Added: trunk/Master/texmf-dist/doc/bibtex/gost/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/README.md	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/README.md	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,327 @@
+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.
+
+It 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.
+
+The System of Standards includes:
+GOST 7.0.5-2008  Bibliographic reference.
+                 General requirements and rules of making.
+GOST 7.1  -2003  Bibliographic record.
+                 Bibliographic description.
+                 General requirements and rules.
+GOST 7.80 -2000  Bibliographic record.
+                 Heading. General requirements and rules.
+GOST 7.11 -2004  Bibliographic description and references.
+                 Rules for the abbreviation of words and word combinations
+                 in foreign European languages.
+GOST 7.83 -2001  Electronic editions. Basic types and imprint.
+Etc.
+
+GOST comprises 16 BibTeX styles to format bibliography in English, Russian
+and Ukrainian according to GOST 7.0.5-2008 and GOST 7.1-2003. Both 8-bit
+and Unicode (UTF-8) versions of each BibTeX style, in each case offering
+a choice of sorted and unsorted. Further, 2 more styles, |gost780| and
+|gost780s| styles (not conforming to effective standards) are retained
+for backwards compatibility.
+
+All BibTeX styles are derived from same master file |gost.dtx| by applying
+different set of options as shown in the table below.
+
+------------------------------------------------------------------------
+ Style         | utf8 | strict | modern | eprint | long | sort | natbib
+------------------------------------------------------------------------
+ gost780       |      |        |        |        |      |      |
+ gost780s      |      |        |        |        |      |   +  |
+------------------------------------------------------------------------
+ gost2003      |      |   +    |        |    +   |      |      |
+ gost2003s     |      |   +    |        |    +   |      |   +  |
+ gost2008      |      |        |   +    |    +   |      |      |
+ gost2008n     |      |        |   +    |    +   |      |      |   +
+ gost2008l     |      |        |   +    |    +   |   +  |      |
+ gost2008s     |      |        |   +    |    +   |      |   +  |
+ gost2008ns    |      |        |   +    |    +   |      |   +  |   +
+ gost2008ls    |      |        |   +    |    +   |   +  |   +  |
+------------------------------------------------------------------------
+ ugost2003     |  +   |   +    |        |    +   |      |      |
+ ugost2003s    |  +   |   +    |        |    +   |      |   +  |
+ ugost2008     |  +   |        |   +    |    +   |      |      |
+ ugost2008n    |  +   |        |   +    |    +   |      |      |   +
+ ugost2008l    |  +   |        |   +    |    +   |   +  |      |
+ ugost2008s    |  +   |        |   +    |    +   |      |   +  |
+ ugost2008ns   |  +   |        |   +    |    +   |      |   +  |   +
+ ugost2008ls   |  +   |        |   +    |    +   |   +  |   +  |
+------------------------------------------------------------------------
+ Style         | utf8 | strict | modern | eprint | long | sort | natbib
+------------------------------------------------------------------------
+
+|Gost2008| style is recommended for most applications. It corresponds to the
+currently effective Standard 7.0.5-2008. Librarians should use the style
+|gost2003| instead of |gost2008| to compile a library catalog to meet the
+Standard 7.1-2003. Use of other styles is best explained through
+the meaning of options used to compile those styles from the master source.
+
+Two styles, |gost780| and |gost780s|, generated without |modern| and
+|strict| options, are retained for backward compatibility. They do not
+conform the Standards 7.0.5-2008 and 7.1-2003 cited above.
+
+The |strict| option provides conformance to the Standard 7.1-2003. The
+styles compiled with that option bear the name |gost2003| with possible
+suffixes |s|, |l|, |n| as explained below. These styles are intended
+primarily for the librarians who compose a library catalog.
+
+The |modern| option meets the Standard 7.0.5-2008 which can be thought
+off as a relaxed version of the Standard 7.1-2003. The styles compiled with
+that option bear the name |gost2008| with possible suffixes |s|, |l|, |n|.
+The |strict| option  has precedence over |modern| so that a style compiled
+with both options will resemble mainly the |gost2003| style rather than
+|gost2008|.
+
+If the number of authors exceeds 4, modern styles cut the list of authors
+to at most 4 persons as prescibed by the Standards. The option
+|long| overrides this rule to provide backward compatibility with the
+package disser by Stanislab Kruchinin. Two styles, |gost2008l| and
+|gost2008ls|, compiled with the option |long| mimic behavior of the styles
+|gost705| and |gost705s| from the disser package. Major
+effect of the |long| option is that the list of authors always
+precedes book or article title no matter how long is it.
+Modern styles compiled without |long| place long list of authors behind
+the title. The names of styles compiled with the option |long| has the
+suffix |l|. Recall that those styles do not conform effective Standards and
+their use is discouraged.
+
+The |eprint| option enables formatting electronic publications. In particular,
+it enables |eprint|, |eprinttype|, |eprintclass|, and |doi| fields for a
+bibliographic entry. The styles, generated without the |eprint| option,
+just ignore these fields. Starting from the version 1.2 of the GOST package,
+all modern styles are compiled with this option included, and therefore the
+suffix |e| which designated this option in earlier  versions is not appended
+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
+4 styles with that option are available for public use.
+
+The |sort| option enables sorting bibliographic references by author names
+and titles of references. The names of styles compiled with the option |sort|
+bear the suffix |s|. Sorting does not work as expected for databases in
+unicode encoding (see below).
+
+Finally, the |utf8| option produces bibliographic styles in unicode rather
+that in 8-bit encoding. Names of those styles bear the prefix |u|.
+
+
+Beyond bibliographic style, GOST bundle contains CS files (codepage and
+sorting order).
+
+----------------------------------------------------------------
+ Encoding        |   CSF                 Sorting order
+----------------------------------------------------------------
+ cp866           |   ruscii.csf          Cyrillic first, Latin
+ cp1251          |   cp1251.csf          Cyrillic first, Latin
+ koi8-u          |   koi8u.csf           Cyrillic first, Latin
+ utf8            |   utf8cyrillic.csf    Cyrillic first, Latin
+----------------------------------------------------------------
+
+In addition, BibTeX8 distribution comes with few more CSFs.
+
+----------------------------------------------------------------
+ Encoding        |   CSF                 Sorting order
+----------------------------------------------------------------
+ cp866           |   cp866rus.csf        Latin first, Cyrillic
+----------------------------------------------------------------
+
+
+How to use
+
+1. Select bibliography style by adding appropriate \bibliographystyle
+   declaration to your source file <filename>.tex, e.g.
+
+	\bibliographystyle{gost2008}
+	\bibliography{database}
+
+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 partially supported.
+
+3. To compile list of references from your database use bibtex8.exe
+   rather than bibtex.exe. Depending on the codepage of your
+   bibliographic database, indicate one of the CS files
+   listed above as option to bibtex8.exe.  Run LaTeX, then run
+   bibTeX8 and again LaTeX:
+
+   	latex <filename>.tex
+   	bibtex8 -B -c <csf_file>.csf <filename>.aux
+	latex <filename>.tex
+
+4. For details on preparing bibliographic database see
+   examples in |gost*.pdf|.
+
+5. Ugost*.bst styles are primarily intended for use
+   with unicode compilers (xelatex and lualatex). They
+   should be preferred as well when using 8bit compilers
+   (latex and pdflatex) if source file is in utf8 encoding.
+
+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.
+
+7. Bibtex8 fails to change case of a string if it contains Cyrillic
+   letter in unicode. Therefore ugost2008* styles do not change case of
+   titles and other parts of bibliographic record while 8-bit styles
+   do the case change where appropriate.
+
+8. Either |bibtex8| or |Bibtex8| fail to cut Cyrillic names to
+   initials. Therefore |ugost2008*| styles do not modify the name of
+   authors.
+
+9. Package |natbib| should be loaded when using styles with
+   suffix |n| in their names.
+
+
+Customization
+
+Every GOST style defines few commands to format some parts of a
+reference. You can redefine these commands prior to
+the \bibliography{<bibtex_style>} command. Initial
+definitions are listed below.
+
+	\providecommand*{\url}[1]{{\small #1}}
+	\providecommand*{\BibUrl}[1]{\url{#1}}
+	\providecommand{\BibAnnote}[1]{}
+	\providecommand*{\BibEmph}[1]{#1}
+
+By default, gost styles separate logical parts of a bibliography
+record by a period and cyrdash (. "---). It is legitimate to drop
+that dash by overriding the command \BibDash as follows
+
+	\providecommand*{\BibDash}{}
+
+By default, \BibDash is equivalent to the shorthand "---
+introduced by the babel package with the option russian.
+It prints a so called Cyrillic dash (\cyrdash), which is
+20% shorter than ordinary LaTeX dash (---), and puts
+unbreakable space before \cyrdash so that the dash never
+appears at the beginning of a line.
+
+
+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.2i (2017.01.12)
+
+1. Documentation and examples update (thanks to Leonid Sinev).
+
+2, Restored @MastersThesis instead of @MasterThesis (thanks to Leonid Sinev).
+
+3. Media="eresource" field is introduced in addition to the media="online" and
+   media="text"; if present, the media field is not ignored any more in
+   modern bst-styles compiled without the strict option.
+
+4. Location field is introduced as an alias of address field.
+
+5. @DSCISTHESIS entry renamed to @DOCTHESIS.
+
+6. School field is now treated as an alias of institution.
+
+7. Specialitycode is added for @THESIS and similar entries; number is treated as
+   alias of specialitycode.
+
+8. Type field in THESIS and similar entries can now accept three values 
+   (mathesis, phdthesis, docthesis) which are translated to built-in 
+   language-sensitive strings; any other value is reproduced literally.  
+
+
+What's new in version 1.2h (2016.08.21)
+
+1. Minor changes in documentation.
+
+
+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;
+2. New macro format.month.
+3. \cyrdash is now faked via \ProvideTextCommandDefault if not defined.
+
+
+What's new in version 1.2c (2015.01.10)
+
+1. langid field added; language field supported for backward compatibility.
+2. eid field added, it has priority over pages field;
+3. Fix Gost2003: "--- replaced by \BibDash;
+4. Spacing around \BibDash improved.
+
+
+What's new in version 1.2b (2014.01.19)
+
+1. numpages renamed to pagetotal.
+
+
+What's new in version 1.2a (2012.08.31)
+
+1. \cyrdash is now defined via \ProvideTextCommand rather than \providecommand.
+
+
+What's new in version 1.2 (2012.02.22)
+
+1. Code refactoring. All styles are now generated from single source file.
+2. Support for GOST-7.1-2003. The field |medium| is added to reflect type
+   of material. For most entry types |medium| defaults to |text|.
+3. Support for |natbib| package.
+4. All modern styles are now compiled with the |eprint| option.
+
+
+What's new in version 1.1 (2012.01.21)
+
+1. Support for GOST 7.0.5-2008 and GOST 7.1-2003 is provided.
+2. |@Online| entry is added to format a reference to electronic
+   resource on Internet.
+3. |@MastersThesis| entry is added to format a reference to master's thesis.
+   |@DSciThesis| entry is added to format a reference to doctor of
+   sciences thesis.
+4. |Urldate|, |eprint|, |eprintclass|, |eprinttype| fields are added.
+
+
+Version history
+
+2012.08.31 \cyrdash is now defined via \ProvideTextCommand.
+2012.02.22 Support for |natbib| package.
+2012.02.02 Adaptation to GOST 7.0.5, electronic publishing.
+2005.08.12 First version uploaded to CTAN.
+2003.06.06 First public version.
+
+
+
+Please, send feature requests and bug reports via e-mail:
+  kia999  at mail  dot ru   <Igor A. Kotelnikov>
+or
+  polyama at yahoo dot com  <Maksym Polyakov>
+
+Happy BibTeXing!

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/dobib.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/dobib.cmd	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/dobib.cmd	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,20 +0,0 @@
-rename .\bib\examples.bib examples.bak
-REM pause
-copy .\bib\ex*.bib .\bib\examples.bib
-REM pause
-for %%f in (gost7*.tex) do pdflatex -quiet %%f 
-for %%f in (gost200*.tex) do pdflatex -quiet %%f 
-
-REM pause
-for %%f in (gost*.aux) do bibtex8 -B -c cp1251.csf %%f 
-
-REM pause
-for %%f in (gost7*.tex) do pdflatex %%f 
-for %%f in (gost200*.tex) do pdflatex %%f 
-for %%f in (gost2008-nat*.tex) do pdflatex %%f 
-for %%f in (gost2008-sort*.tex) do pdflatex %%f 
-
-del *.aux *.out *.toc *.brf .pdf
-del *.bbl 
-del *.blg 
-del *.log

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex01.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @BOOK{Vasylenko92,
-    author = "Василенко, М. В.",
-    title = "Теорія коливань: Навчальний посібник",
-    address = "К.",
-    publisher = "Вища школа",
-    year = 1992,
-    pagetotal = 430,
-    language = "ukrainian"
+  author       = {Василенко, М. В.},
+  title        = {Теорія коливань: Навчальний посібник},
+  address      = {К.},
+  publisher    = {Вища школа},
+  year         = {1992},
+  pagetotal    = {430},
+  language     = {ukrainian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex02.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @BOOK{Afanasyev92,
-    author = "Афанасьев, В. В. and Василевский, О. Н.",
-    title = "Расчеты электрических цепей 
-      на программируемых микрокалькуляторах",
-    address = "М.",
-    publisher = "Энергоиздат",
-    year = 1992,
-    pagetotal = 190,
-    language = "russian"
+  author       = {Афанасьев, В. В. and Василевский, О. Н.},
+  title        = {Расчеты электрических цепей
+                  на программируемых микрокалькуляторах},
+  address      = {М.},
+  publisher    = {Энергоиздат},
+  year         = {1992},
+  pagetotal    = {190},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex03.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Makilov91,
-    author = "Меликов, А. З. and Пономаренко, Л. А. 
-      and Рюмшин, П. А.",
-    title = "Математические модели многопотоковых 
-      систем обслуживания",
-    address = "К.",
-    publisher = "Техніка",
-    year = 1991,
-    pagetotal = 265,
-    language = "russian"
+  author       = {Меликов, А. З. and Пономаренко, Л. А.
+                  and Рюмшин, П. А.},
+  title        = {Математические модели многопотоковых
+                  систем обслуживания},
+  address      = {К.},
+  publisher    = {Техніка},
+  year         = {1991},
+  pagetotal    = {265},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex04.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Ponomarenko86,
-  title = "Основы создания гибких атоматизированных производств",
-  author = "Л. А. Пономаренко and Л. В. Адамович 
-    and В. Т. Музычук and  А. Е. Гридасов",
-  editor = "Б. Б. Тимофеева",
-  address   = "К.",
-  publisher = "Техніка",
-  year = 1986,
-  pagetotal = 144,
-  language = "russian"
+  title        = {Основы создания гибких атоматизированных производств},
+  author       = {Л. А. Пономаренко and Л. В. Адамович
+                  and В. Т. Музычук and  А. Е. Гридасов},
+  editor       = {Б. Б. Тимофеева},
+  address      = {К.},
+  publisher    = {Техніка},
+  year         = {1986},
+  pagetotal    = {144},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex05.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Belousova81,
-  title = "Системный анализ инфраструктуры 
-    как элемент народного хозяйства",
-  author = "Белоусова, Н. И. and Вишняк, Е. И. 
-    and Левит, В. Ю. and others",
-  address   = "М.",
-  publisher = "Экономика",
-  year = 1981,
-  pagetotal = 62,
-  language = "russian"
-}
\ No newline at end of file
+  title        = {Системный анализ инфраструктуры
+                  как элемент народного хозяйства},
+  author       = {Белоусова, Н. И. and Вишняк, Е. И.
+                  and Левит, В. Ю. and others},
+  address      = {М.},
+  publisher    = {Экономика},
+  year         = {1981},
+  pagetotal    = {62},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @BOOK{BibOp91,
-    title = "Составление библиографического описания: 
-      Краткие правила",
-    organization = "Междувед. каталогизац. комис. 
-      при Гос. б-ке СССР им.~В.~И. Ленина",
-    edition = "2-е, доп.",
-    address   = "М.",
-    publisher = "Кн.~палата",
-    year = 1991,
-    pagetotal = 224,
-    language = "russian"
+  title        = {Составление библиографического описания:
+                  Краткие правила},
+  organization = {Междувед. каталогизац. комис.
+                  при Гос. б-ке СССР им.~В.~И. Ленина},
+  edition      = {2-е, доп.},
+  address      = {М.},
+  publisher    = {Кн.~палата},
+  year         = {1991},
+  pagetotal    = {224},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex06a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @BOOK{Poems82,
-    title = "Стихи о музыке. Русские, 
-      советские, зарубежные поэты: Сборник",
-    compiler = "А. Бирюкова and В. Татаринов",
-    address   = "М.",
-    publisher = "Сов. композитор",
-    year = 1982,
-    pagetotal = 224,
-    language = "russian"
+  title        = {Стихи о музыке. Русские,
+                  советские, зарубежные поэты: Сборник},
+  compiler     = {А. Бирюкова and В. Татаринов},
+  address      = {М.},
+  publisher    = {Сов. композитор},
+  year         = {1982},
+  pagetotal    = {224},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex07.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @BOOK{HistLit82,
-    title = "История русской литературы: В 4 т.",
-    organization = "АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)",
-    address   = "М.",
-    year = 1982,
-    Volume = "3: Расцвет реализма",
-    pagetotal = 876,
-    language = "russian"
-}
\ No newline at end of file
+  title        = {История русской литературы: В 4 т.},
+  organization = {АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)},
+  address      = {М.},
+  year         = {1982},
+  volume       = {3: Расцвет реализма},
+  pagetotal    = {876},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex08.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
- at Book{Landau:eldin,
-    author  = "Л. Д. Ландау and Е. М. Лифшиц",
-    title   = "Теоретическая физика: учебное пособие в 10 т.",
-    publisher       = "Наука. Гл.\ ред.\ физ.-мат.\ лит.",
-    address = "М.",
-    year    = 1992,
-    volume  = "VIII. Электродинамика сплошных сред",
-    edition = "3-е, испр.",
-    language = "russian"
+ at BOOK{Landau:eldin,
+  author       = {Л. Д. Ландау and Е. М. Лифшиц},
+  title        = {Теоретическая физика: учебное пособие в 10 т.},
+  publisher    = {Наука. Гл.\ ред.\ физ.-мат.\ лит.},
+  address      = {М.},
+  year         = {1992},
+  volume       = {VIII. Электродинамика сплошных сред},
+  edition      = {3-е, испр.},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex09.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
- at Book{BRLS94,
-  title      = "Нарысы па гiсторыi беларуска-рускiх 
-    лiтаратурных сувязей: У 4 кн.",
-  organization = "Акад.\ навук Беларусi. Iн-т лiт.",
-  address = "Мiнск",
-  publisher = "Навука i тэхнiка",
-  year = "1994",
-  volume = "2: Пачатак ХХ ст. 1900--1917 гг.",
-  editor = "В. А. Каваленка and I. Я. Навуменка",
-  pagetotal = 440,
-  language = "russian"
+ at BOOK{BRLS94,
+  title        = {Нарысы па гiсторыi беларуска-рускiх
+                  лiтаратурных сувязей: У 4 кн.},
+  organization = {Акад.\ навук Беларусi. Iн-т лiт.},
+  address      = {Мiнск},
+  publisher    = {Навука i тэхнiка},
+  year         = {1994},
+  volume       = {2: Пачатак ХХ ст. 1900--1917 гг.},
+  editor       = {В. А. Каваленка and I. Я. Навуменка},
+  pagetotal    = {440},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex10.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @BOOK{Grosse80,
-    author = "Гроссе, Э. and Вайсмангель, Х.",
-    title = "Химия для любознательных: Пер.\ с нем.",
-    address   = "М.",
-    publisher = "Химия",
-    year = 1980,
-    pagetotal = 392,
-    language = "russian"
-}
\ No newline at end of file
+  author       = {Гроссе, Э. and Вайсмангель, Х.},
+  title        = {Химия для любознательных: Пер.\ с нем.},
+  address      = {М.},
+  publisher    = {Химия},
+  year         = {1980},
+  pagetotal    = {392},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex11.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,11 @@
 @BOOK{GOST7184,
-    title = "ГОСТ 7.1.-84. Библиографическое описание документа. 
-      Общие требования и правила составления. 
-      --- Взамен ГОСТ 7.1.-76; Введ. 01.01.86.",
-    address   = "М.",
-    publisher = "Изд-во стандартов",
-    year = 1984,
-    pagetotal = 78,
-    language = "russian"
+  key          = {ГОСТ},
+  title        = {ГОСТ 7.1-84. Библиографическое описание документа.
+                  Общие требования и правила составления.
+                  --- Взамен ГОСТ 7.1-76~; введ. 01.01.86.},
+  address      = {М.},
+  publisher    = {Изд-во стандартов},
+  year         = {1984},
+  pagetotal    = {78},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex12.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,8 +1,8 @@
 @BOOK{ObchTech93,
-    title = "Обчислювальна і прикладна математика: Зб.наук.пр.",
-    address   = "К.",
-    publisher = "Либідь",
-    year = 1993,
-    pagetotal = 99,
-    language = "ukrainian"
-}
\ No newline at end of file
+  title        = {Обчислювальна і прикладна математика: Зб.наук.пр.},
+  address      = {К.},
+  publisher    = {Либідь},
+  year         = {1993},
+  pagetotal    = {99},
+  language     = {ukrainian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex13.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @BOOK{Bibdelo86,
-    title = "Библиотечное дело: Терминол. словарь",
-    composer = "И. М. Суслова  and Л. Н. Уланова",
-    edition = "2-е изд.",
-    address   = "М.",
-    publisher = "Книга",
-    year = 1986,
-    pagetotal = 224,
-    language = "russian"
-}
\ No newline at end of file
+  title        = {Библиотечное дело: Терминол. словарь},
+  composer     = {И. М. Суслова  and Л. Н. Уланова},
+  edition      = {2-е изд.},
+  address      = {М.},
+  publisher    = {Книга},
+  year         = {1986},
+  pagetotal    = {224},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @INBOOK{Ponomarenko79,
-    author = "Пономаренко, Л. А.",
-    title = "Организующая система",
-    booktitle = "Автоматизация технологических процессов 
-      в прокатном производстве",
-    address   = "М.",
-    publisher = "Металлургия",
-    year = 1979,
-    pages = "141-148",
-    language = "russian"
+  author       = {Пономаренко, Л. А.},
+  title        = {Организующая система},
+  booktitle    = {Автоматизация технологических процессов
+                  в прокатном производстве},
+  address      = {М.},
+  publisher    = {Металлургия},
+  year         = {1979},
+  pages        = {141-148},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex14a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @INBOOK{Zeyts70,
-    author = "Зейтц, Ф.",
-    title = "О приведении пространственных групп",
-    booktitle = "Симметрия в твердом теле",
-    bookauthor = "Нокс, Р. and Голд, А.",
-    address   = "М.",
-    publisher = "Наука",
-    year = 1970,
-    pages = "172--186",
-    language = "russian"
+  author       = {Зейтц, Ф.},
+  title        = {О приведении пространственных групп},
+  booktitle    = {Симметрия в твердом теле},
+  bookauthor   = {Нокс, Р. and Голд, А.},
+  address      = {М.},
+  publisher    = {Наука},
+  year         = {1970},
+  pages        = {172--186},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex15.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @INCOLLECTION{Ponoomarenko76,
-    author = "Пономаренко, Л. А.",
-    title = "Структура системы прерывания с ситуационными
-      приоритетами в АСУТП станов горячей прокатки",
-    booktitle = "Разработка автоматизированных систем управления 
-      технологическими процессами",
-    address   = "Тбилиси",
-    publisher = "Сабчота Сакартвело",
-    year = 1976,
-    pages = "3-16",
-    language = "russian"
+  author       = {Пономаренко, Л. А.},
+  title        = {Структура системы прерывания с ситуационными
+                  приоритетами в АСУТП станов горячей прокатки},
+  booktitle    = {Разработка автоматизированных систем управления
+                  технологическими процессами},
+  address      = {Тбилиси},
+  publisher    = {Сабчота Сакартвело},
+  year         = {1976},
+  pages        = {3-16},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex16.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
- at Article{Malikov92,
-    author = "Меликов, А. З. and Пономаренко, Л. А.",
-    title = "Оптимизация цифровой сети интегрального обслуживания 
-      с конечным числом пользователей и блокировками",
-    journal = "Автоматика и телемеханика",
-    year = 1992,
-    number =  6,
-    pages = "34-38",
-    language = "russian"
+ at ARTICLE{Malikov92,
+  author       = {Меликов, А. З. and Пономаренко, Л. А.},
+  title        = {Оптимизация цифровой сети интегрального обслуживания
+                  с конечным числом пользователей и блокировками},
+  journal      = {Автоматика и телемеханика},
+  year         = {1992},
+  number       = {6},
+  pages        = {34-38},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
- at Article{Ponomarenko86a,
-    author = "Пономаренко, Л. А. and Меликов, А. З.",
-    title = "Ситуационное управление многоканальной системой 
-      с переменной структурой обслуживания неоднородного потока",
-    journal = "Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук",
-    year = 1986,
-    volume = 7,
-    number = 6,
-    pages = "79-83",
-    language = "russian"
+ at ARTICLE{Ponomarenko86a,
+  author       = {Пономаренко, Л. А. and Меликов, А. З.},
+  title        = {Ситуационное управление многоканальной системой
+                  с переменной структурой обслуживания неоднородного потока},
+  journal      = {Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук},
+  year         = {1986},
+  volume       = {7},
+  number       = {6},
+  pages        = {79-83},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,8 +1,8 @@
- at Article{   dixit.pindyck:options,
-  title = {The Options Approach to Capital Investment},
-  author = {Avinash K. Dixit and Robert S. Pindyck},
-  journal = {Harvard Business Review},
-  year = {1995},
-  month = {May-June},
-  pages = {105--115}
+ at ARTICLE{dixit.pindyck:options,
+  title        = {The Options Approach to Capital Investment},
+  author       = {Avinash K. Dixit and Robert S. Pindyck},
+  journal      = {Harvard Business Review},
+  year         = {1995},
+  month        = {May-June},
+  pages        = {105--115},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex17b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @ARTICLE{RosGaz-article,
-    title = "Федеральный закон о внесении изменений 
-      и дополнений в Семейный кодекс Российской Федерации",
-    journal = "Российская газета",
-    year = 1997,
-    month = "19 нояб",
-    pages = 4,
-    note = "Российская Федерация. Законы",
-    language = "russian"
+  title        = {Федеральный закон о внесении изменений
+                  и дополнений в Семейный кодекс Российской Федерации},
+  journal      = {Российская газета},
+  year         = {1997},
+  month        = {19 нояб},
+  pages        = {4},
+  note         = {Российская Федерация. Законы},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex18.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @INBOOK{Dolmatovskiy88,
-    author = "Долматовский, Ю. А.",
-    title = "Электромобиль",
-    booktitle = "БСЭ",
-    edition = "3-е",
-    address   = "М.",
-    year = 1988,
-    volume = 30,
-    pages = 72,
-    language = "russian"
+  author       = {Долматовский, Ю. А.},
+  title        = {Электромобиль},
+  booktitle    = {БСЭ},
+  edition      = {3-е},
+  address      = {М.},
+  year         = {1988},
+  volume       = {30},
+  pages        = {72},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex19.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,14 +1,14 @@
 @INPROCEEDINGS{Ponomarenko88,
-    author = "Пономаренко, Л. А. and Жучкова, И. В.",
-    title = "Оптимальное назначение приоритетов 
-      при организации доступа в локальных 
-      вычислительных сетях АСУТП",
-    booktitle = {Труды Междунар.\ конф.\ 
-      <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)},
-    volume = 1,
-    address   = "Рига",
-    publisher = "ИЭВТ АН Латвии",
-    year = 1988,
-    pages = "149-153",
-    language = "russian"
+  author       = {Пономаренко, Л. А. and Жучкова, И. В.},
+  title        = {Оптимальное назначение приоритетов
+                  при организации доступа в локальных
+                  вычислительных сетях АСУТП},
+  booktitle    = {Труды Междунар.\ конф.\
+                  <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)},
+  volume       = {1},
+  address      = {Рига},
+  publisher    = {ИЭВТ АН Латвии},
+  year         = {1988},
+  pages        = {149-153},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @INPROCEEDINGS{Melikov95,
-    author = "Melikov, A. Z. and Ponomarenko, L. A.",
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+  author       = {Melikov, A. Z. and Ponomarenko, L. A.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,30 +1,28 @@
 @INPROCEEDINGS{Gojchuk98,
-    author="Гойчук, А. Ф.",
-    title="Особливості етіології і патогенезу поперечного раку 
-      дуба звичайного в Україні",
-    booktitle="Науковий вісник Національного 
-      аграрного університету",
-    editor="Мельничука, Д. О. and others",
-    address="К.",
-    publisher="НАУ",
-    year=1998,
-    series="Вип. 8: Лісівництво",
-    pages="168--173",
-    language="ukrainian"
+  author       = {Гойчук, А. Ф.},
+  title        = {Особливості етіології і патогенезу поперечного раку
+                  дуба звичайного в Україні},
+  booktitle    = {Науковий вісник Національного
+                  аграрного університету},
+  editor       = {Мельничука, Д. О. and others},
+  address      = {К.},
+  publisher    = {НАУ},
+  year         = {1998},
+  series       = {Вип. 8: Лісівництво},
+  pages        = {168--173},
+  language     = {ukrainian},
 }
 
 @INPROCEEDINGS{Polyakov98a,
-    author="М. О. Поляков",
-    title="Системний ефект агрегування лісосік в управлінні
-      лісовими ресурсами на регіональному рівні",
-    crossref="Gojchuk98",
-    annote = "Розглянуто ефект агрегування елементарних
-      господарських одиниць на розмір розрахункової лісосіки.
-      Запропоновано метод визначення максимально допустимого розміру
-      рубання за площею на рівні регіону в контексті системи
-      державного регулювання лісокористування для умов ринкової
-      економіки",
-    pages="213--220"
+  author       = {М. О. Поляков},
+  title        = {Системний ефект агрегування лісосік в управлінні
+                  лісовими ресурсами на регіональному рівні},
+  crossref     = {Gojchuk98},
+  annote       = {Розглянуто ефект агрегування елементарних
+                  господарських одиниць на розмір розрахункової лісосіки.
+                  Запропоновано метод визначення максимально допустимого розміру
+                  рубання за площею на рівні регіону в контексті системи
+                  державного регулювання лісокористування для умов ринкової
+                  економіки},
+  pages        = {213--220},
 }
-
- 
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,17 +1,16 @@
 @INPROCEEDINGS{TranskSpivrob99:Purich,
-    author = "Пурич, Штефан",
-    title = "{Р}умынско-{У}краинское трансграничное сотрудничество: 
-      проблемы  и перспективы",
-    language = "russian",
-    booktitle = "Транскордонне співробітництво у поліетнічних регіонах
-      {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового
-      симпозіуму",
-    editor = "Макара, Ю.",
-    address = "Чернівці",
-    publisher = "Золоті литаври",
-    organization = "Буковинський політологічний центр",
-    year = 1999,
-    pagetotal = 196,
-    booklanguage = "ukrainian"
+  author       = {Пурич, Штефан},
+  title        = {{Р}умынско-{У}краинское трансграничное сотрудничество:
+                  проблемы  и перспективы},
+  language     = {russian},
+  booktitle    = {Транскордонне співробітництво у поліетнічних регіонах
+                  {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового
+                  симпозіуму},
+  editor       = {Макара, Ю.},
+  address      = {Чернівці},
+  publisher    = {Золоті литаври},
+  organization = {Буковинський політологічний центр},
+  year         = {1999},
+  pagetotal    = {196},
+  booklanguage = {ukrainian},
 }
- 
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex20c.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,20 +1,20 @@
 @INPROCEEDINGS{Selikov95,
-    author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+  author       = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }
 
 @INPROCEEDINGS{Selikov+95,
-    author = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515",
-    language = "russian"
+  author       = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,14 +1,14 @@
 @PHDTHESIS{Luus82,
-  author = "Луус, Роман  Аркадьевич",
-  title = "Исследование оборудования с пневмовакуумным 
-    приводом для захвата, перемещения и фиксации 
-    при обработке пористых и легкоповреждаемых 
-    строительных изделий",
-  type = "Дисссертация на соискание ученой степени кандидата технических наук",
-  number = "05.05.04",
-  school = "Моск.\ строит.\ ин-т",
-  address   = "М.",
-  year = 1982,
-  pagetotal = 212,
-  language = "russian"
+  author       = {Луус, Роман  Аркадьевич},
+  title        = {Исследование оборудования с пневмовакуумным
+                  приводом для захвата, перемещения и фиксации
+                  при обработке пористых и легкоповреждаемых
+                  строительных изделий},
+  type         = {Диссертация на соискание ученой степени кандидата технических наук},
+  number       = {05.05.04},
+  institution  = {Моск.\ строит.\ ин-т},
+  address      = {М.},
+  year         = {1982},
+  pagetotal    = {212},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
- at DSciTHESIS{KIA95-default,
-  author = "Котельников, Игорь Александрович",
-  title = "Теория магнитного удержания двухкомпонентной плазмы 
-      в открытых ловушках",
-  number = "01.04.08",
-  school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН",
-  address   = "Новосибирск",
-  year = 1995,
-  pagetotal = 350,
-  language = "russian"
+ at DOCTHESIS{KIA95-default,
+  author       = {Котельников, Игорь Александрович},
+  title        = {Теория магнитного удержания двухкомпонентной плазмы
+                  в открытых ловушках},
+  number       = {01.04.08},
+  institution  = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН},
+  address      = {Новосибирск},
+  year         = {1995},
+  pagetotal    = {350},
+  language     = {russian},
 }

Added: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex21b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,17 @@
+ at MASTERSTHESIS{mastersthesis-minimal,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  year         = {1988},
+  institution  = {Stanford University},
+}
+
+ at MASTERSTHESIS{mastersthesis-full,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  month        = jun,
+  note         = {This is a full MASTERSTHESIS entry},
+  type         = {Master's project},
+  year         = {1988},
+  address      = {English Department},
+  institution  = {Stanford University},
+}

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex22.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +0,0 @@
- at THESIS{KIA85-autoref,
-  author = "Котельников, Игорь Александрович",
-  title = "Теория магнитного удержания двухкомпонентной плазмы 
-      в открытых ловушках",
-  type = "Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук",
-  number = "01.04.08",
-  school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН",
-  address   = "Новосибирск",
-  year = 1995,
-  pagetotal = 17,
-  language = "russian"
-}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex23.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Ponomarenko76,
-  author = "Пономаренко, Л. А. and Буадзе, В. В.",
-  title = "Математические модели и алгоритмы сбора 
-    и обработки информации в АСУТП непрерывных 
-    станов горячей прокатки",
-  address   = "К.",
-  year = 1976,
-  pagetotal = 37,
-  language = "russian",
-  note = "(Препр./ АН Украины. Ин-т кибернетики; 76-76)"
+  author       = {Пономаренко, Л. А. and Буадзе, В. В.},
+  title        = {Математические модели и алгоритмы сбора
+                  и обработки информации в АСУТП непрерывных
+                  станов горячей прокатки},
+  address      = {К.},
+  year         = {1976},
+  pagetotal    = {37},
+  language     = {russian},
+  note         = {(Препр./ АН Украины. Ин-т кибернетики; 76-76)},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,15 +1,15 @@
 @REPORT{Report81-rep,
-  title = {Проведение испытаний и исследований 
-    теплотехнических свойств камер {КХС-2-12-ВЗ} 
-    и {КХС-2-12-КЗІО}},
-  institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
-  address   = "М.",
+  title        = {Проведение испытаний и исследований
+                  теплотехнических свойств камер {КХС-2-12-ВЗ}
+                  и {КХС-2-12-КЗІО}},
+  institution  = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
+  address      = {М.},
   organization = {ВИНИТИ},
-  year = 1981,
-  pagetotal = 90,
-  type = "Отчет о {НИР}",
-  editor = "Путин, В. В.",
-  author = "Медведев, Д. А. and others",
-  note = {Инв.\ № В 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  type         = {Отчет о {НИР}},
+  editor       = {Путин, В. В.},
+  author       = {Медведев, Д. А. and others},
+  note         = {Инв.\ № В 119692},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @REPORT{Report81b-rep-notype,
-  title = {Проведение испытаний и исследований 
-    теплотехнических свойств камер {КХС-2-12-ВЗ} 
-    и {КХС-2-12-КЗІО}},
-  institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
-  address   = "М.",
+  title        = {Проведение испытаний и исследований
+                  теплотехнических свойств камер {КХС-2-12-ВЗ}
+                  и {КХС-2-12-КЗІО}},
+  institution  = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
+  address      = {М.},
   organization = {ВИНИТИ},
-  year = 1981,
-  pagetotal = 90,
-  note = {Инв.\ № В 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  note         = {Инв.\ № В 119692},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex24b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,14 +1,14 @@
 @TECHREPORT{Report81-techrep,
-  title = {Проведение испытаний и исследований 
-    теплотехнических свойств камер {КХС-2-12-ВЗ} 
-    и {КХС-2-12-КЗІО}},
-  institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
-  address   = "М.",
+  title        = {Проведение испытаний и исследований
+                  теплотехнических свойств камер {КХС-2-12-ВЗ}
+                  и {КХС-2-12-КЗІО}},
+  institution  = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
+  address      = {М.},
   organization = {ВИНИТИ},
-  year = 1981,
-  pagetotal = 90,
-  editor = "Путин, В. В.",
-  author = "Медведев, Д. А. and others",
-  note = {Инв.\ № В 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  editor       = {Путин, В. В.},
+  author       = {Медведев, Д. А. and others},
+  note         = {Инв.\ № В 119692},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex25.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,11 @@
 @BOOK{CatalogMamals81,
-    title = {Каталог млекопитающих СССР. 
-      Плиоцен "--- современность},
-    organization = "АН СССР, Зоол.\ ин-т",
-    editor = "И. М. Громова and Г. И. Барановой",
-    address   = "Л.",
-    publisher = "Наука, Ленинг.\ отд-ние",
-    year = 1981,
-    pagetotal = 456,
-    language = "russian"
+  title        = {Каталог млекопитающих СССР.
+                  Плиоцен "--- современность},
+  organization = {АН СССР, Зоол.\ ин-т},
+  editor       = {И. М. Громова and Г. И. Барановой},
+  address      = {Л.},
+  publisher    = {Наука, Ленинг.\ отд-ние},
+  year         = {1981},
+  pagetotal    = {456},
+  language     = {russian},
 }
-

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex26.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @BOOK{Instr86,
-    title = "Типовая инструкция по эксплуатации 
-      топливоотдачи тепловых электростанций: 
-      ТИ 34-70-044-85: Утв. Гл. техн. упр. 
-      по эксплуатации энергосистем 01.10.85: 
-      Срок действия установлен с 01.01.86 до 01.01.95",
-    organization = "М-во энергетики и электрификации СССР",
-    address   = "М.",
-    year = 1986,
-    pagetotal = 43,
-    language = "russian"
+  title        = {Типовая инструкция по эксплуатации
+                  топливоотдачи тепловых электростанций~:
+                  ТИ 34-70-044-85~: Утв. Гл. техн. упр.
+                  по эксплуатации энергосистем 01.10.85~:
+                  Срок действия установлен с 01.01.86 до 01.01.95},
+  organization = {М-во энергетики и электрификации СССР},
+  address      = {М.},
+  year         = {1986},
+  pagetotal    = {43},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,18 +1,18 @@
- at online{ wiki:latex,
-   author = "Wikipedia",
-   title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia",
-   year = "2012",
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia},
+  year         = {2012},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }
 
- at online{ wiki:latex-2,
-   author = "Wikipedia",
-   title = "{\LaTeX}",
-   howpublished = "Wikipedia, The Free Encyclopedia",
-   year = "2012",
-   eprint ="wiki/LaTeX",
-   eprinttype   = {WikiPedia},
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex-2,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}},
+  howpublished = {Wikipedia, The Free Encyclopedia},
+  year         = {2012},
+  eprint       = {wiki/LaTeX},
+  eprinttype   = {WikiPedia},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
- at online{ phys:moodle,
-  author = {Черкасский, В. С.},
-  title = {Классная комната},
-  howpublished = "Физический факультет",
-  organization = "НГУ",
-  year = 2012,
-  url = {http://www.phys.nsu.ru/moodle/},
-  urldate = "16.01.2012",
-  language = "russian"
+ at ONLINE{phys:moodle,
+  author       = {Черкасский, В. С.},
+  title        = {Классная комната},
+  howpublished = {Физический факультет},
+  organization = {НГУ},
+  year         = {2012},
+  url          = {http://www.phys.nsu.ru/moodle/},
+  urldate      = {16.01.2012},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex27c.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -4,5 +4,5 @@
   url          = {http://www-nds.iaea.org/exfor},
   address      = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria},
   year         = {2012},
-  medium       = {Electronic resource}
+  media        = {eresource}
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @BOOK{IsaacNewton,
   author       = {Newton, {\relax Sir Isaac}},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   publisher    = {William Innys},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {eresource},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
@@ -13,13 +13,13 @@
 
 @BOOK{IsaacNewton-sl:sn,
   author       = {{\relax Sir I}saac Newton},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {online},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
-%  publisher    = {William Innys},
+%  publisher   = {William Innys},

Added: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex28a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,32 @@
+ at BOOK{Encyclopedia,
+  title        = {Художественная энциклопедия зарубежного классического искусства},
+  publisher    = {Большая Рос. энцикл.},
+  year         = {1996},
+  address      = {М.},
+  note         = {1 электрон. опт. диск (CD-ROM)},
+  language     = {russian},
+  media        = {eresource},
+}
+
+ at ARTICLE{Nasirova,
+  title        = {Модели государственного регулирования страховой деятельности},
+  author       = {Насырова, Г. А.},
+  language     = {russian},
+  note         = {Режим доступа: http://vestnik.fa.ru/4(28)2003/4.html},
+  number       = {4},
+  year         = {2003},
+  journal      = {Вестник Финансовой академии},
+  media2       = {eresource},
+  media        = {online},
+}
+
+ at BOOK{kremlincd,
+  title        = {Московский Кремль},
+  titleaddon   = {трехмер. путеводитель},
+  language     = {russian},
+  note         = {CD-ROM},
+  date         = {2007},
+  location     = {М.},
+  publisher    = {Новый Диск},
+  media        = {eresource},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex29.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,15 +1,15 @@
- at article{PhysRevLett.101.085006,
-  author = {Kotelnikov, Igor and Rom\'e, Massimiliano},
-  volume = {101},
-  journal = {Phys. Rev. Lett.},
-  month = {Aug},
-  pagetotal = {4},
-  title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
-  year = {2008},
-  doi = {10.1103/PhysRevLett.101.085006},
-  issue = {8},
-  publisher = {American Physical Society},
-  pages = {085006}
+ at ARTICLE{PhysRevLett.101.085006,
+  author       = {Kotelnikov, Igor and Rom\'e, Massimiliano},
+  volume       = {101},
+  journal      = {Phys. Rev. Lett.},
+  month        = {Aug},
+  pagetotal    = {4},
+  title        = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
+  year         = {2008},
+  doi          = {10.1103/PhysRevLett.101.085006},
+  issue        = {8},
+  publisher    = {American Physical Society},
+  pages        = {085006},
 }
 
 % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006},

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex30.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,27 +1,27 @@
 @ARTICLE{1998PhRvE..57.7111K,
-   author = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
-    title = "{Turbulent cascades in anisotropic magnetohydrodynamics}",
-  journal = pre,
- keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
-     year = 1998,
-    month = jun,
-   volume = 57,
-    pages = {7111-7121},
-      doi = {10.1103/PhysRevE.57.7111},
-   adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
-  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+  author       = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
+  title        = {{Turbulent cascades in anisotropic magnetohydrodynamics}},
+  journal      = pre,
+  keywords     = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
+  year         = {1998},
+  month        = jun,
+  volume       = {57},
+  pages        = {7111-7121},
+  doi          = {10.1103/PhysRevE.57.7111},
+  adsurl       = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
+  adsnote      = {Provided by the SAO/NASA Astrophysics Data System},
 }
 
 @ARTICLE{1998UFN,
-   author = {Котельников, И. А. and Астрелин, В. Т.},
-    title = "Теория плазменного эмиттера положительных ионов",
-  journal = ufn,
- keywords = {плазменный эмиттер, критерий Бома},
-     year = 2015,
-    month = jul,
-   volume = 185,
-    pages = {753-771},
- language = {russian},
-      doi = {10.3367/UFNr.0185.201507c.0753},
-      url = {http://ufn.ru/ru/articles/2015/7/c/},
+  author       = {Котельников, И. А. and Астрелин, В. Т.},
+  title        = {Теория плазменного эмиттера положительных ионов},
+  journal      = ufn,
+  keywords     = {плазменный эмиттер, критерий Бома},
+  year         = {2015},
+  month        = jul,
+  volume       = {185},
+  pages        = {753-771},
+  language     = {russian},
+  doi          = {10.3367/UFNr.0185.201507c.0753},
+  url          = {http://ufn.ru/ru/articles/2015/7/c/},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/ex31.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,40 +1,40 @@
 @PATENT{patent1,
-  	author          = {Э. В. Тернер},
+  	author      = {Э. В. Тернер},
   	authorcountry   = {США},
-  	title           = {Одноразовая ракета-носитель},
-  	media           = {Текст},
-  	type            = {заявка},
-  	number          = {1095735},
-  	location        = {Рос. Федерация},
-  	ipc             = {МПК\ensuremath{^7} B 64 G 1/00},
-  	holder          = {заявитель Спейс Системз/Лорал, инк.},
-  	credits         = {патент. поверенный Егорова Г. Б.},
+  	title       = {Одноразовая ракета-носитель},
+  	media       = {text},
+  	type        = {заявка},
+  	number      = {1095735},
+  	location    = {Рос. Федерация},
+  	ipc         = {МПК\ensuremath{^7} B 64 G 1/00},
+  	holder      = {заявитель Спейс Системз/Лорал, инк.},
+  	credits     = {патент. поверенный Егорова Г. Б.},
   	requestnumber   = {000108705/28},
-  	requestdate     = {07.04.2000},
+  	requestdate = {07.04.2000},
   	publicationdate = {10.03.2001},
-  	publication     = {Бюл. № 7 (I ч.)},
-  	prioritydate    = {09.04.1999},
+  	publication = {Бюл. № 7 (I ч.)},
+  	prioritydate= {09.04.1999},
   	prioritynumber  = {09/289, 037},
   	prioritycountry = {США},
-    pagetotal       = {5 с.~: ил.},
-  	language        = {russian},
+        pagetotal   = {5 с.~: ил.},
+  	language    = {russian},
 }
 
 @PATENT{patent2,
-  	author          = {В. И. Чугаева},
+  	author      = {В. И. Чугаева},
   	authorcountry   = {РФ},
-  	title           = {Приемопередающее устройство},
-  	media           = {Текст},
-  	type            = {пат.},
-  	number          = {2000131736/09},
-  	location        = {Рос. Федерация},
-  	ipc             = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
-  	holder          = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
-  	credits         = {патент. поверенный Егорова Г. Б.},
+  	title       = {Приемопередающее устройство},
+  	media       = {text},
+  	type        = {пат.},
+  	number      = {2000131736/09},
+  	location    = {Рос. Федерация},
+  	ipc         = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+  	holder      = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+  	credits     = {патент. поверенный Егорова Г. Б.},
   	requestnumber   = {000108705/28},
-  	date            = {18.12.2000},
+  	date        = {18.12.2000},
   	publicationdate = {20.08.2002},
-  	publication     = {Бюл. № 23 (II ч.)},
-    pagetotal       = {2 с.~: ил.},
-  	language        = {russian},
+  	publication = {Бюл. № 23 (II ч.)},
+        pagetotal   = {2 с.~: ил.},
+  	language    = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bib/examples.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,452 +1,519 @@
 @BOOK{Vasylenko92,
-    author = "Василенко, М. В.",
-    title = "Теорія коливань: Навчальний посібник",
-    address = "К.",
-    publisher = "Вища школа",
-    year = 1992,
-    pagetotal = 430,
-    language = "ukrainian"
+  author       = {Василенко, М. В.},
+  title        = {Теорія коливань: Навчальний посібник},
+  address      = {К.},
+  publisher    = {Вища школа},
+  year         = {1992},
+  pagetotal    = {430},
+  language     = {ukrainian},
 }
 @BOOK{Afanasyev92,
-    author = "Афанасьев, В. В. and Василевский, О. Н.",
-    title = "Расчеты электрических цепей 
-      на программируемых микрокалькуляторах",
-    address = "М.",
-    publisher = "Энергоиздат",
-    year = 1992,
-    pagetotal = 190,
-    language = "russian"
+  author       = {Афанасьев, В. В. and Василевский, О. Н.},
+  title        = {Расчеты электрических цепей
+                  на программируемых микрокалькуляторах},
+  address      = {М.},
+  publisher    = {Энергоиздат},
+  year         = {1992},
+  pagetotal    = {190},
+  language     = {russian},
 }
 @BOOK{Makilov91,
-    author = "Меликов, А. З. and Пономаренко, Л. А. 
-      and Рюмшин, П. А.",
-    title = "Математические модели многопотоковых 
-      систем обслуживания",
-    address = "К.",
-    publisher = "Техніка",
-    year = 1991,
-    pagetotal = 265,
-    language = "russian"
+  author       = {Меликов, А. З. and Пономаренко, Л. А.
+                  and Рюмшин, П. А.},
+  title        = {Математические модели многопотоковых
+                  систем обслуживания},
+  address      = {К.},
+  publisher    = {Техніка},
+  year         = {1991},
+  pagetotal    = {265},
+  language     = {russian},
 }
 @BOOK{Ponomarenko86,
-  title = "Основы создания гибких атоматизированных производств",
-  author = "Л. А. Пономаренко and Л. В. Адамович 
-    and В. Т. Музычук and  А. Е. Гридасов",
-  editor = "Б. Б. Тимофеева",
-  address   = "К.",
-  publisher = "Техніка",
-  year = 1986,
-  pagetotal = 144,
-  language = "russian"
+  title        = {Основы создания гибких атоматизированных производств},
+  author       = {Л. А. Пономаренко and Л. В. Адамович
+                  and В. Т. Музычук and  А. Е. Гридасов},
+  editor       = {Б. Б. Тимофеева},
+  address      = {К.},
+  publisher    = {Техніка},
+  year         = {1986},
+  pagetotal    = {144},
+  language     = {russian},
 }
 @BOOK{Belousova81,
-  title = "Системный анализ инфраструктуры 
-    как элемент народного хозяйства",
-  author = "Белоусова, Н. И. and Вишняк, Е. И. 
-    and Левит, В. Ю. and others",
-  address   = "М.",
-  publisher = "Экономика",
-  year = 1981,
-  pagetotal = 62,
-  language = "russian"
-}@BOOK{BibOp91,
-    title = "Составление библиографического описания: 
-      Краткие правила",
-    organization = "Междувед. каталогизац. комис. 
-      при Гос. б-ке СССР им.~В.~И. Ленина",
-    edition = "2-е, доп.",
-    address   = "М.",
-    publisher = "Кн.~палата",
-    year = 1991,
-    pagetotal = 224,
-    language = "russian"
+  title        = {Системный анализ инфраструктуры
+                  как элемент народного хозяйства},
+  author       = {Белоусова, Н. И. and Вишняк, Е. И.
+                  and Левит, В. Ю. and others},
+  address      = {М.},
+  publisher    = {Экономика},
+  year         = {1981},
+  pagetotal    = {62},
+  language     = {russian},
 }
+ at BOOK{BibOp91,
+  title        = {Составление библиографического описания:
+                  Краткие правила},
+  organization = {Междувед. каталогизац. комис.
+                  при Гос. б-ке СССР им.~В.~И. Ленина},
+  edition      = {2-е, доп.},
+  address      = {М.},
+  publisher    = {Кн.~палата},
+  year         = {1991},
+  pagetotal    = {224},
+  language     = {russian},
+}
 @BOOK{Poems82,
-    title = "Стихи о музыке. Русские, 
-      советские, зарубежные поэты: Сборник",
-    compiler = "А. Бирюкова and В. Татаринов",
-    address   = "М.",
-    publisher = "Сов. композитор",
-    year = 1982,
-    pagetotal = 224,
-    language = "russian"
+  title        = {Стихи о музыке. Русские,
+                  советские, зарубежные поэты: Сборник},
+  compiler     = {А. Бирюкова and В. Татаринов},
+  address      = {М.},
+  publisher    = {Сов. композитор},
+  year         = {1982},
+  pagetotal    = {224},
+  language     = {russian},
 }
 @BOOK{HistLit82,
-    title = "История русской литературы: В 4 т.",
-    organization = "АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)",
-    address   = "М.",
-    year = 1982,
-    Volume = "3: Расцвет реализма",
-    pagetotal = 876,
-    language = "russian"
-}@Book{Landau:eldin,
-    author  = "Л. Д. Ландау and Е. М. Лифшиц",
-    title   = "Теоретическая физика: учебное пособие в 10 т.",
-    publisher       = "Наука. Гл.\ ред.\ физ.-мат.\ лит.",
-    address = "М.",
-    year    = 1992,
-    volume  = "VIII. Электродинамика сплошных сред",
-    edition = "3-е, испр.",
-    language = "russian"
+  title        = {История русской литературы: В 4 т.},
+  organization = {АН СССР, Ин-т рус.~лит.\ (Пушкин.дом)},
+  address      = {М.},
+  year         = {1982},
+  volume       = {3: Расцвет реализма},
+  pagetotal    = {876},
+  language     = {russian},
 }
- at Book{BRLS94,
-  title      = "Нарысы па гiсторыi беларуска-рускiх 
-    лiтаратурных сувязей: У 4 кн.",
-  organization = "Акад.\ навук Беларусi. Iн-т лiт.",
-  address = "Мiнск",
-  publisher = "Навука i тэхнiка",
-  year = "1994",
-  volume = "2: Пачатак ХХ ст. 1900--1917 гг.",
-  editor = "В. А. Каваленка and I. Я. Навуменка",
-  pagetotal = 440,
-  language = "russian"
+ at BOOK{Landau:eldin,
+  author       = {Л. Д. Ландау and Е. М. Лифшиц},
+  title        = {Теоретическая физика: учебное пособие в 10 т.},
+  publisher    = {Наука. Гл.\ ред.\ физ.-мат.\ лит.},
+  address      = {М.},
+  year         = {1992},
+  volume       = {VIII. Электродинамика сплошных сред},
+  edition      = {3-е, испр.},
+  language     = {russian},
 }
+ at BOOK{BRLS94,
+  title        = {Нарысы па гiсторыi беларуска-рускiх
+                  лiтаратурных сувязей: У 4 кн.},
+  organization = {Акад.\ навук Беларусi. Iн-т лiт.},
+  address      = {Мiнск},
+  publisher    = {Навука i тэхнiка},
+  year         = {1994},
+  volume       = {2: Пачатак ХХ ст. 1900--1917 гг.},
+  editor       = {В. А. Каваленка and I. Я. Навуменка},
+  pagetotal    = {440},
+  language     = {russian},
+}
 @BOOK{Grosse80,
-    author = "Гроссе, Э. and Вайсмангель, Х.",
-    title = "Химия для любознательных: Пер.\ с нем.",
-    address   = "М.",
-    publisher = "Химия",
-    year = 1980,
-    pagetotal = 392,
-    language = "russian"
-}@BOOK{GOST7184,
-    title = "ГОСТ 7.1.-84. Библиографическое описание документа. 
-      Общие требования и правила составления. 
-      --- Взамен ГОСТ 7.1.-76; Введ. 01.01.86.",
-    address   = "М.",
-    publisher = "Изд-во стандартов",
-    year = 1984,
-    pagetotal = 78,
-    language = "russian"
+  author       = {Гроссе, Э. and Вайсмангель, Х.},
+  title        = {Химия для любознательных: Пер.\ с нем.},
+  address      = {М.},
+  publisher    = {Химия},
+  year         = {1980},
+  pagetotal    = {392},
+  language     = {russian},
 }
+ at BOOK{GOST7184,
+  key          = {ГОСТ},
+  title        = {ГОСТ 7.1-84. Библиографическое описание документа.
+                  Общие требования и правила составления.
+                  --- Взамен ГОСТ 7.1-76~; введ. 01.01.86.},
+  address      = {М.},
+  publisher    = {Изд-во стандартов},
+  year         = {1984},
+  pagetotal    = {78},
+  language     = {russian},
+}
 @BOOK{ObchTech93,
-    title = "Обчислювальна і прикладна математика: Зб.наук.пр.",
-    address   = "К.",
-    publisher = "Либідь",
-    year = 1993,
-    pagetotal = 99,
-    language = "ukrainian"
-}@BOOK{Bibdelo86,
-    title = "Библиотечное дело: Терминол. словарь",
-    composer = "И. М. Суслова  and Л. Н. Уланова",
-    edition = "2-е изд.",
-    address   = "М.",
-    publisher = "Книга",
-    year = 1986,
-    pagetotal = 224,
-    language = "russian"
-}@INBOOK{Ponomarenko79,
-    author = "Пономаренко, Л. А.",
-    title = "Организующая система",
-    booktitle = "Автоматизация технологических процессов 
-      в прокатном производстве",
-    address   = "М.",
-    publisher = "Металлургия",
-    year = 1979,
-    pages = "141-148",
-    language = "russian"
+  title        = {Обчислювальна і прикладна математика: Зб.наук.пр.},
+  address      = {К.},
+  publisher    = {Либідь},
+  year         = {1993},
+  pagetotal    = {99},
+  language     = {ukrainian},
 }
+ at BOOK{Bibdelo86,
+  title        = {Библиотечное дело: Терминол. словарь},
+  composer     = {И. М. Суслова  and Л. Н. Уланова},
+  edition      = {2-е изд.},
+  address      = {М.},
+  publisher    = {Книга},
+  year         = {1986},
+  pagetotal    = {224},
+  language     = {russian},
+}
+ at INBOOK{Ponomarenko79,
+  author       = {Пономаренко, Л. А.},
+  title        = {Организующая система},
+  booktitle    = {Автоматизация технологических процессов
+                  в прокатном производстве},
+  address      = {М.},
+  publisher    = {Металлургия},
+  year         = {1979},
+  pages        = {141-148},
+  language     = {russian},
+}
 @INBOOK{Zeyts70,
-    author = "Зейтц, Ф.",
-    title = "О приведении пространственных групп",
-    booktitle = "Симметрия в твердом теле",
-    bookauthor = "Нокс, Р. and Голд, А.",
-    address   = "М.",
-    publisher = "Наука",
-    year = 1970,
-    pages = "172--186",
-    language = "russian"
+  author       = {Зейтц, Ф.},
+  title        = {О приведении пространственных групп},
+  booktitle    = {Симметрия в твердом теле},
+  bookauthor   = {Нокс, Р. and Голд, А.},
+  address      = {М.},
+  publisher    = {Наука},
+  year         = {1970},
+  pages        = {172--186},
+  language     = {russian},
 }
 @INCOLLECTION{Ponoomarenko76,
-    author = "Пономаренко, Л. А.",
-    title = "Структура системы прерывания с ситуационными
-      приоритетами в АСУТП станов горячей прокатки",
-    booktitle = "Разработка автоматизированных систем управления 
-      технологическими процессами",
-    address   = "Тбилиси",
-    publisher = "Сабчота Сакартвело",
-    year = 1976,
-    pages = "3-16",
-    language = "russian"
+  author       = {Пономаренко, Л. А.},
+  title        = {Структура системы прерывания с ситуационными
+                  приоритетами в АСУТП станов горячей прокатки},
+  booktitle    = {Разработка автоматизированных систем управления
+                  технологическими процессами},
+  address      = {Тбилиси},
+  publisher    = {Сабчота Сакартвело},
+  year         = {1976},
+  pages        = {3-16},
+  language     = {russian},
 }
- at Article{Malikov92,
-    author = "Меликов, А. З. and Пономаренко, Л. А.",
-    title = "Оптимизация цифровой сети интегрального обслуживания 
-      с конечным числом пользователей и блокировками",
-    journal = "Автоматика и телемеханика",
-    year = 1992,
-    number =  6,
-    pages = "34-38",
-    language = "russian"
+ at ARTICLE{Malikov92,
+  author       = {Меликов, А. З. and Пономаренко, Л. А.},
+  title        = {Оптимизация цифровой сети интегрального обслуживания
+                  с конечным числом пользователей и блокировками},
+  journal      = {Автоматика и телемеханика},
+  year         = {1992},
+  number       = {6},
+  pages        = {34-38},
+  language     = {russian},
 }
- at Article{Ponomarenko86a,
-    author = "Пономаренко, Л. А. and Меликов, А. З.",
-    title = "Ситуационное управление многоканальной системой 
-      с переменной структурой обслуживания неоднородного потока",
-    journal = "Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук",
-    year = 1986,
-    volume = 7,
-    number = 6,
-    pages = "79-83",
-    language = "russian"
+ at ARTICLE{Ponomarenko86a,
+  author       = {Пономаренко, Л. А. and Меликов, А. З.},
+  title        = {Ситуационное управление многоканальной системой
+                  с переменной структурой обслуживания неоднородного потока},
+  journal      = {Изв.\ АН Азерб.\ Респ. Сер.\ физ.-техн.\ и мат.\ наук},
+  year         = {1986},
+  volume       = {7},
+  number       = {6},
+  pages        = {79-83},
+  language     = {russian},
 }
- at Article{   dixit.pindyck:options,
-  title = {The Options Approach to Capital Investment},
-  author = {Avinash K. Dixit and Robert S. Pindyck},
-  journal = {Harvard Business Review},
-  year = {1995},
-  month = {May-June},
-  pages = {105--115}
+ at ARTICLE{dixit.pindyck:options,
+  title        = {The Options Approach to Capital Investment},
+  author       = {Avinash K. Dixit and Robert S. Pindyck},
+  journal      = {Harvard Business Review},
+  year         = {1995},
+  month        = {May-June},
+  pages        = {105--115},
 }
 @ARTICLE{RosGaz-article,
-    title = "Федеральный закон о внесении изменений 
-      и дополнений в Семейный кодекс Российской Федерации",
-    journal = "Российская газета",
-    year = 1997,
-    month = "19 нояб",
-    pages = 4,
-    note = "Российская Федерация. Законы",
-    language = "russian"
+  title        = {Федеральный закон о внесении изменений
+                  и дополнений в Семейный кодекс Российской Федерации},
+  journal      = {Российская газета},
+  year         = {1997},
+  month        = {19 нояб},
+  pages        = {4},
+  note         = {Российская Федерация. Законы},
+  language     = {russian},
 }
 @INBOOK{Dolmatovskiy88,
-    author = "Долматовский, Ю. А.",
-    title = "Электромобиль",
-    booktitle = "БСЭ",
-    edition = "3-е",
-    address   = "М.",
-    year = 1988,
-    volume = 30,
-    pages = 72,
-    language = "russian"
+  author       = {Долматовский, Ю. А.},
+  title        = {Электромобиль},
+  booktitle    = {БСЭ},
+  edition      = {3-е},
+  address      = {М.},
+  year         = {1988},
+  volume       = {30},
+  pages        = {72},
+  language     = {russian},
 }
 @INPROCEEDINGS{Ponomarenko88,
-    author = "Пономаренко, Л. А. and Жучкова, И. В.",
-    title = "Оптимальное назначение приоритетов 
-      при организации доступа в локальных 
-      вычислительных сетях АСУТП",
-    booktitle = {Труды Междунар.\ конф.\ 
-      <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)},
-    volume = 1,
-    address   = "Рига",
-    publisher = "ИЭВТ АН Латвии",
-    year = 1988,
-    pages = "149-153",
-    language = "russian"
+  author       = {Пономаренко, Л. А. and Жучкова, И. В.},
+  title        = {Оптимальное назначение приоритетов
+                  при организации доступа в локальных
+                  вычислительных сетях АСУТП},
+  booktitle    = {Труды Междунар.\ конф.\
+                  <<Локальные вычислительные сети>> (ЛОКСЕТЬ 88)},
+  volume       = {1},
+  address      = {Рига},
+  publisher    = {ИЭВТ АН Латвии},
+  year         = {1988},
+  pages        = {149-153},
+  language     = {russian},
 }
 @INPROCEEDINGS{Melikov95,
-    author = "Melikov, A. Z. and Ponomarenko, L. A.",
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+  author       = {Melikov, A. Z. and Ponomarenko, L. A.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }
 @INPROCEEDINGS{Gojchuk98,
-    author="Гойчук, А. Ф.",
-    title="Особливості етіології і патогенезу поперечного раку 
-      дуба звичайного в Україні",
-    booktitle="Науковий вісник Національного 
-      аграрного університету",
-    editor="Мельничука, Д. О. and others",
-    address="К.",
-    publisher="НАУ",
-    year=1998,
-    series="Вип. 8: Лісівництво",
-    pages="168--173",
-    language="ukrainian"
+  author       = {Гойчук, А. Ф.},
+  title        = {Особливості етіології і патогенезу поперечного раку
+                  дуба звичайного в Україні},
+  booktitle    = {Науковий вісник Національного
+                  аграрного університету},
+  editor       = {Мельничука, Д. О. and others},
+  address      = {К.},
+  publisher    = {НАУ},
+  year         = {1998},
+  series       = {Вип. 8: Лісівництво},
+  pages        = {168--173},
+  language     = {ukrainian},
 }
 
 @INPROCEEDINGS{Polyakov98a,
-    author="М. О. Поляков",
-    title="Системний ефект агрегування лісосік в управлінні
-      лісовими ресурсами на регіональному рівні",
-    crossref="Gojchuk98",
-    annote = "Розглянуто ефект агрегування елементарних
-      господарських одиниць на розмір розрахункової лісосіки.
-      Запропоновано метод визначення максимально допустимого розміру
-      рубання за площею на рівні регіону в контексті системи
-      державного регулювання лісокористування для умов ринкової
-      економіки",
-    pages="213--220"
+  author       = {М. О. Поляков},
+  title        = {Системний ефект агрегування лісосік в управлінні
+                  лісовими ресурсами на регіональному рівні},
+  crossref     = {Gojchuk98},
+  annote       = {Розглянуто ефект агрегування елементарних
+                  господарських одиниць на розмір розрахункової лісосіки.
+                  Запропоновано метод визначення максимально допустимого розміру
+                  рубання за площею на рівні регіону в контексті системи
+                  державного регулювання лісокористування для умов ринкової
+                  економіки},
+  pages        = {213--220},
 }
-
- @INPROCEEDINGS{TranskSpivrob99:Purich,
-    author = "Пурич, Штефан",
-    title = "{Р}умынско-{У}краинское трансграничное сотрудничество: 
-      проблемы  и перспективы",
-    language = "russian",
-    booktitle = "Транскордонне співробітництво у поліетнічних регіонах
-      {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового
-      симпозіуму",
-    editor = "Макара, Ю.",
-    address = "Чернівці",
-    publisher = "Золоті литаври",
-    organization = "Буковинський політологічний центр",
-    year = 1999,
-    pagetotal = 196,
-    booklanguage = "ukrainian"
+ at INPROCEEDINGS{TranskSpivrob99:Purich,
+  author       = {Пурич, Штефан},
+  title        = {{Р}умынско-{У}краинское трансграничное сотрудничество:
+                  проблемы  и перспективы},
+  language     = {russian},
+  booktitle    = {Транскордонне співробітництво у поліетнічних регіонах
+                  {С}хідної та {П}івденно-{С}хідної {Є}вропи: {М}атеріали наукового
+                  симпозіуму},
+  editor       = {Макара, Ю.},
+  address      = {Чернівці},
+  publisher    = {Золоті литаври},
+  organization = {Буковинський політологічний центр},
+  year         = {1999},
+  pagetotal    = {196},
+  booklanguage = {ukrainian},
 }
- @INPROCEEDINGS{Selikov95,
-    author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+ at INPROCEEDINGS{Selikov95,
+  author       = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }
 
 @INPROCEEDINGS{Selikov+95,
-    author = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515",
-    language = "russian"
+  author       = {Селиков, A. Z. and Пономарь, L. A. and Крамаренко, L. S. and Золкин, Л. Ю.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
+  language     = {russian},
 }
 @PHDTHESIS{Luus82,
-  author = "Луус, Роман  Аркадьевич",
-  title = "Исследование оборудования с пневмовакуумным 
-    приводом для захвата, перемещения и фиксации 
-    при обработке пористых и легкоповреждаемых 
-    строительных изделий",
-  type = "Дисссертация на соискание ученой степени кандидата технических наук",
-  number = "05.05.04",
-  school = "Моск.\ строит.\ ин-т",
-  address   = "М.",
-  year = 1982,
-  pagetotal = 212,
-  language = "russian"
+  author       = {Луус, Роман  Аркадьевич},
+  title        = {Исследование оборудования с пневмовакуумным
+                  приводом для захвата, перемещения и фиксации
+                  при обработке пористых и легкоповреждаемых
+                  строительных изделий},
+  type         = {Диссертация на соискание ученой степени кандидата технических наук},
+  number       = {05.05.04},
+  institution  = {Моск.\ строит.\ ин-т},
+  address      = {М.},
+  year         = {1982},
+  pagetotal    = {212},
+  language     = {russian},
 }
- at DSciTHESIS{KIA95-default,
-  author = "Котельников, Игорь Александрович",
-  title = "Теория магнитного удержания двухкомпонентной плазмы 
-      в открытых ловушках",
-  number = "01.04.08",
-  school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН",
-  address   = "Новосибирск",
-  year = 1995,
-  pagetotal = 350,
-  language = "russian"
+ at DOCTHESIS{KIA95-default,
+  author       = {Котельников, Игорь Александрович},
+  title        = {Теория магнитного удержания двухкомпонентной плазмы
+                  в открытых ловушках},
+  number       = {01.04.08},
+  institution  = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН},
+  address      = {Новосибирск},
+  year         = {1995},
+  pagetotal    = {350},
+  language     = {russian},
 }
+ at MASTERSTHESIS{mastersthesis-minimal,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  year         = {1988},
+  institution  = {Stanford University},
+}
+
+ at MASTERSTHESIS{mastersthesis-full,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  month        = jun,
+  note         = {This is a full MASTERSTHESIS entry},
+  type         = {Master's project},
+  year         = {1988},
+  address      = {English Department},
+  institution  = {Stanford University},
+}
 @THESIS{KIA85-autoref,
-  author = "Котельников, Игорь Александрович",
-  title = "Теория магнитного удержания двухкомпонентной плазмы 
-      в открытых ловушках",
-  type = "Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук",
-  number = "01.04.08",
-  school = "Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН",
-  address   = "Новосибирск",
-  year = 1995,
-  pagetotal = 17,
-  language = "russian"
+  author       = {Котельников, Игорь Александрович},
+  title        = {Теория магнитного удержания двухкомпонентной плазмы
+                  в открытых ловушках},
+  type         = {Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук},
+  number       = {01.04.08},
+  school       = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН},
+  address      = {Новосибирск},
+  year         = {1995},
+  pagetotal    = {17},
+  language     = {russian},
 }
+ at THESIS{vishnyakov:thesis1,
+  title        = {Модели и методы оценки коммерческих банков в условиях неопределенности},
+  author       = {Вишняков, Илья Владимирович},
+  year         = {2002},
+  date         = {2002-02-04},
+  langid       = {russian},
+  language     = {russian},
+  location     = {М.},
+  speciality   = {экон. наук},
+  number       = {08.00.13},
+  pagetotal    = {234},
+  titleaddon   = {защищена 12.02.02~: утв. 24.06.02},
+}
+
+ at THESIS{vishnyakov:thesis2,
+  title        = {Модели и методы оценки коммерческих банков в условиях неопределенности},
+  author       = {Вишняков, Илья Владимирович},
+  type         = {phdthesis},
+  addendum     = {Библиогр.: с. 220---230.~--- 04200204433},
+  _year         = {2002},
+  date         = {2002-02-04},
+  langid       = {russian},
+  language     = {russian},
+  location     = {М.},
+  speciality     = {экон. наук},
+  specialitycode = {08.00.13},
+  media        = {text},
+  pagetotal    = {234},
+  titleaddon   = {защищена 12.02.02~: утв. 24.06.02},
+}
+
+
+ at THESIS{Skvortsov:2008,
+  title        = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+  author       = {Скворцов, Михаил Андреевич},
+  type         = {docthesis},
+  _year         = {2008},
+  institution  = {ИТФ им. Л.\,Д.~Ландау},
+  langid       = {russian},
+  language     = {russian},
+  location     = {Черноголовка},
+  speciality     = {физ.-мат. наук},
+  specialitycode = {01.04.02},
+  media        = {text},
+  pagetotal    = {224},
+}
 @BOOK{Ponomarenko76,
-  author = "Пономаренко, Л. А. and Буадзе, В. В.",
-  title = "Математические модели и алгоритмы сбора 
-    и обработки информации в АСУТП непрерывных 
-    станов горячей прокатки",
-  address   = "К.",
-  year = 1976,
-  pagetotal = 37,
-  language = "russian",
-  note = "(Препр./ АН Украины. Ин-т кибернетики; 76-76)"
+  author       = {Пономаренко, Л. А. and Буадзе, В. В.},
+  title        = {Математические модели и алгоритмы сбора
+                  и обработки информации в АСУТП непрерывных
+                  станов горячей прокатки},
+  address      = {К.},
+  year         = {1976},
+  pagetotal    = {37},
+  language     = {russian},
+  note         = {(Препр./ АН Украины. Ин-т кибернетики; 76-76)},
 }
 @REPORT{Report81-rep,
-  title = {Проведение испытаний и исследований 
-    теплотехнических свойств камер {КХС-2-12-ВЗ} 
-    и {КХС-2-12-КЗІО}},
-  institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
-  address   = "М.",
+  title        = {Проведение испытаний и исследований
+                  теплотехнических свойств камер {КХС-2-12-ВЗ}
+                  и {КХС-2-12-КЗІО}},
+  institution  = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
+  address      = {М.},
   organization = {ВИНИТИ},
-  year = 1981,
-  pagetotal = 90,
-  type = "Отчет о {НИР}",
-  editor = "Путин, В. В.",
-  author = "Медведев, Д. А. and others",
-  note = {Инв.\ № В 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  type         = {Отчет о {НИР}},
+  editor       = {Путин, В. В.},
+  author       = {Медведев, Д. А. and others},
+  note         = {Инв.\ № В 119692},
+  language     = {russian},
 }
 @REPORT{Report81b-rep-notype,
-  title = {Проведение испытаний и исследований 
-    теплотехнических свойств камер {КХС-2-12-ВЗ} 
-    и {КХС-2-12-КЗІО}},
-  institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
-  address   = "М.",
+  title        = {Проведение испытаний и исследований
+                  теплотехнических свойств камер {КХС-2-12-ВЗ}
+                  и {КХС-2-12-КЗІО}},
+  institution  = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
+  address      = {М.},
   organization = {ВИНИТИ},
-  year = 1981,
-  pagetotal = 90,
-  note = {Инв.\ № В 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  note         = {Инв.\ № В 119692},
+  language     = {russian},
 }
 @TECHREPORT{Report81-techrep,
-  title = {Проведение испытаний и исследований 
-    теплотехнических свойств камер {КХС-2-12-ВЗ} 
-    и {КХС-2-12-КЗІО}},
-  institution = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
-  address   = "М.",
+  title        = {Проведение испытаний и исследований
+                  теплотехнических свойств камер {КХС-2-12-ВЗ}
+                  и {КХС-2-12-КЗІО}},
+  institution  = {Всесоюзн.\ заочн.\ ин-т пищ.\ пром-ти},
+  address      = {М.},
   organization = {ВИНИТИ},
-  year = 1981,
-  pagetotal = 90,
-  editor = "Путин, В. В.",
-  author = "Медведев, Д. А. and others",
-  note = {Инв.\ № В 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  editor       = {Путин, В. В.},
+  author       = {Медведев, Д. А. and others},
+  note         = {Инв.\ № В 119692},
+  language     = {russian},
 }
 @BOOK{CatalogMamals81,
-    title = {Каталог млекопитающих СССР. 
-      Плиоцен "--- современность},
-    organization = "АН СССР, Зоол.\ ин-т",
-    editor = "И. М. Громова and Г. И. Барановой",
-    address   = "Л.",
-    publisher = "Наука, Ленинг.\ отд-ние",
-    year = 1981,
-    pagetotal = 456,
-    language = "russian"
+  title        = {Каталог млекопитающих СССР.
+                  Плиоцен "--- современность},
+  organization = {АН СССР, Зоол.\ ин-т},
+  editor       = {И. М. Громова and Г. И. Барановой},
+  address      = {Л.},
+  publisher    = {Наука, Ленинг.\ отд-ние},
+  year         = {1981},
+  pagetotal    = {456},
+  language     = {russian},
 }
-
 @BOOK{Instr86,
-    title = "Типовая инструкция по эксплуатации 
-      топливоотдачи тепловых электростанций: 
-      ТИ 34-70-044-85: Утв. Гл. техн. упр. 
-      по эксплуатации энергосистем 01.10.85: 
-      Срок действия установлен с 01.01.86 до 01.01.95",
-    organization = "М-во энергетики и электрификации СССР",
-    address   = "М.",
-    year = 1986,
-    pagetotal = 43,
-    language = "russian"
+  title        = {Типовая инструкция по эксплуатации
+                  топливоотдачи тепловых электростанций~:
+                  ТИ 34-70-044-85~: Утв. Гл. техн. упр.
+                  по эксплуатации энергосистем 01.10.85~:
+                  Срок действия установлен с 01.01.86 до 01.01.95},
+  organization = {М-во энергетики и электрификации СССР},
+  address      = {М.},
+  year         = {1986},
+  pagetotal    = {43},
+  language     = {russian},
 }
- at online{ wiki:latex,
-   author = "Wikipedia",
-   title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia",
-   year = "2012",
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia},
+  year         = {2012},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }
 
- at online{ wiki:latex-2,
-   author = "Wikipedia",
-   title = "{\LaTeX}",
-   howpublished = "Wikipedia, The Free Encyclopedia",
-   year = "2012",
-   eprint ="wiki/LaTeX",
-   eprinttype   = {WikiPedia},
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex-2,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}},
+  howpublished = {Wikipedia, The Free Encyclopedia},
+  year         = {2012},
+  eprint       = {wiki/LaTeX},
+  eprinttype   = {WikiPedia},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }
- at online{ phys:moodle,
-  author = {Черкасский, В. С.},
-  title = {Классная комната},
-  howpublished = "Физический факультет",
-  organization = "НГУ",
-  year = 2012,
-  url = {http://www.phys.nsu.ru/moodle/},
-  urldate = "16.01.2012",
-  language = "russian"
+ at ONLINE{phys:moodle,
+  author       = {Черкасский, В. С.},
+  title        = {Классная комната},
+  howpublished = {Физический факультет},
+  organization = {НГУ},
+  year         = {2012},
+  url          = {http://www.phys.nsu.ru/moodle/},
+  urldate      = {16.01.2012},
+  language     = {russian},
 }
 @MISC{EXFOR,
   author       = {IAEA},
@@ -454,17 +521,17 @@
   url          = {http://www-nds.iaea.org/exfor},
   address      = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria},
   year         = {2012},
-  medium       = {Electronic resource}
+  media        = {eresource}
 }
 @BOOK{IsaacNewton,
   author       = {Newton, {\relax Sir Isaac}},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   publisher    = {William Innys},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {eresource},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
@@ -471,95 +538,127 @@
 
 @BOOK{IsaacNewton-sl:sn,
   author       = {{\relax Sir I}saac Newton},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {online},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
-%  publisher    = {William Innys},
- at article{PhysRevLett.101.085006,
-  author = {Kotelnikov, Igor and Rom\'e, Massimiliano},
-  volume = {101},
-  journal = {Phys. Rev. Lett.},
-  month = {Aug},
-  pagetotal = {4},
-  title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
-  year = {2008},
-  doi = {10.1103/PhysRevLett.101.085006},
-  issue = {8},
-  publisher = {American Physical Society},
-  pages = {085006}
+%  publisher   = {William Innys},
+ at BOOK{Encyclopedia,
+  title        = {Художественная энциклопедия зарубежного классического искусства},
+  publisher    = {Большая Рос. энцикл.},
+  year         = {1996},
+  address      = {М.},
+  note         = {1 электрон. опт. диск (CD-ROM)},
+  language     = {russian},
+  media        = {eresource},
 }
 
+ at ARTICLE{Nasirova,
+  title        = {Модели государственного регулирования страховой деятельности},
+  author       = {Насырова, Г. А.},
+  language     = {russian},
+  note         = {Режим доступа: http://vestnik.fa.ru/4(28)2003/4.html},
+  number       = {4},
+  year         = {2003},
+  journal      = {Вестник Финансовой академии},
+  media2       = {eresource},
+  media        = {online},
+}
+
+ at BOOK{kremlincd,
+  title        = {Московский Кремль},
+  titleaddon   = {трехмер. путеводитель},
+  language     = {russian},
+  note         = {CD-ROM},
+  date         = {2007},
+  location     = {М.},
+  publisher    = {Новый Диск},
+  media        = {eresource},
+}
+ at ARTICLE{PhysRevLett.101.085006,
+  author       = {Kotelnikov, Igor and Rom\'e, Massimiliano},
+  volume       = {101},
+  journal      = {Phys. Rev. Lett.},
+  month        = {Aug},
+  pagetotal    = {4},
+  title        = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
+  year         = {2008},
+  doi          = {10.1103/PhysRevLett.101.085006},
+  issue        = {8},
+  publisher    = {American Physical Society},
+  pages        = {085006},
+}
+
 % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006},
 @ARTICLE{1998PhRvE..57.7111K,
-   author = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
-    title = "{Turbulent cascades in anisotropic magnetohydrodynamics}",
-  journal = pre,
- keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
-     year = 1998,
-    month = jun,
-   volume = 57,
-    pages = {7111-7121},
-      doi = {10.1103/PhysRevE.57.7111},
-   adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
-  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+  author       = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
+  title        = {{Turbulent cascades in anisotropic magnetohydrodynamics}},
+  journal      = pre,
+  keywords     = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
+  year         = {1998},
+  month        = jun,
+  volume       = {57},
+  pages        = {7111-7121},
+  doi          = {10.1103/PhysRevE.57.7111},
+  adsurl       = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
+  adsnote      = {Provided by the SAO/NASA Astrophysics Data System},
 }
 
 @ARTICLE{1998UFN,
-   author = {Котельников, И. А. and Астрелин, В. Т.},
-    title = "Теория плазменного эмиттера положительных ионов",
-  journal = ufn,
- keywords = {плазменный эмиттер, критерий Бома},
-     year = 2015,
-    month = jul,
-   volume = 185,
-    pages = {753-771},
- language = {russian},
-      doi = {10.3367/UFNr.0185.201507c.0753},
-      url = {http://ufn.ru/ru/articles/2015/7/c/},
+  author       = {Котельников, И. А. and Астрелин, В. Т.},
+  title        = {Теория плазменного эмиттера положительных ионов},
+  journal      = ufn,
+  keywords     = {плазменный эмиттер, критерий Бома},
+  year         = {2015},
+  month        = jul,
+  volume       = {185},
+  pages        = {753-771},
+  language     = {russian},
+  doi          = {10.3367/UFNr.0185.201507c.0753},
+  url          = {http://ufn.ru/ru/articles/2015/7/c/},
 }
 @PATENT{patent1,
-  	author          = {Э. В. Тернер},
+  	author      = {Э. В. Тернер},
   	authorcountry   = {США},
-  	title           = {Одноразовая ракета-носитель},
-  	media           = {Текст},
-  	type            = {заявка},
-  	number          = {1095735},
-  	location        = {Рос. Федерация},
-  	ipc             = {МПК\ensuremath{^7} B 64 G 1/00},
-  	holder          = {заявитель Спейс Системз/Лорал, инк.},
-  	credits         = {патент. поверенный Егорова Г. Б.},
+  	title       = {Одноразовая ракета-носитель},
+  	media       = {text},
+  	type        = {заявка},
+  	number      = {1095735},
+  	location    = {Рос. Федерация},
+  	ipc         = {МПК\ensuremath{^7} B 64 G 1/00},
+  	holder      = {заявитель Спейс Системз/Лорал, инк.},
+  	credits     = {патент. поверенный Егорова Г. Б.},
   	requestnumber   = {000108705/28},
-  	requestdate     = {07.04.2000},
+  	requestdate = {07.04.2000},
   	publicationdate = {10.03.2001},
-  	publication     = {Бюл. № 7 (I ч.)},
-  	prioritydate    = {09.04.1999},
+  	publication = {Бюл. № 7 (I ч.)},
+  	prioritydate= {09.04.1999},
   	prioritynumber  = {09/289, 037},
   	prioritycountry = {США},
-    pagetotal       = {5 с.~: ил.},
-  	language        = {russian},
+        pagetotal   = {5 с.~: ил.},
+  	language    = {russian},
 }
 
 @PATENT{patent2,
-  	author          = {В. И. Чугаева},
+  	author      = {В. И. Чугаева},
   	authorcountry   = {РФ},
-  	title           = {Приемопередающее устройство},
-  	media           = {Текст},
-  	type            = {пат.},
-  	number          = {2000131736/09},
-  	location        = {Рос. Федерация},
-  	ipc             = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
-  	holder          = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
-  	credits         = {патент. поверенный Егорова Г. Б.},
+  	title       = {Приемопередающее устройство},
+  	media       = {text},
+  	type        = {пат.},
+  	number      = {2000131736/09},
+  	location    = {Рос. Федерация},
+  	ipc         = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+  	holder      = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+  	credits     = {патент. поверенный Егорова Г. Б.},
   	requestnumber   = {000108705/28},
-  	date            = {18.12.2000},
+  	date        = {18.12.2000},
   	publicationdate = {20.08.2002},
-  	publication     = {Бюл. № 23 (II ч.)},
-    pagetotal       = {2 с.~: ил.},
-  	language        = {russian},
+  	publication = {Бюл. № 23 (II ч.)},
+        pagetotal   = {2 с.~: ил.},
+  	language    = {russian},
 }

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/bibnocap.sty	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,25 +0,0 @@
-\RequirePackage{bibunits}
-\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt}
-\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0}
-\def\@biblabel#1{#1.\hfill}
-%\endinput
-\renewenvironment{thebibliography}[1]
-      {\list{\@biblabel{\@arabic\c at enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{99}}%
-            \leftmargin\labelwidth
-            \advance\leftmargin\labelsep
-%            \advance\leftmargin\parindent
-            \setcounter{qnuma}{\c at enumiv}
-            \@openbib at code
-            \usecounter{enumiv}%
-            \let\p at enumiv\@empty
-            \setcounter{enumiv}{\theqnuma}
-            \renewcommand\theenumiv{\@arabic\c at enumiv}}%
-      \sloppy
-      \clubpenalty4000
-      \@clubpenalty \clubpenalty
-      \widowpenalty4000%
-      \sfcode`\.\@m}
-     {\def\@noitemerr
-       {\@latex at warning{Empty `thebibliography' environment}}%
-      \endlist}

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/dobib.cmd	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,21 +0,0 @@
-rename .\bib\examples.bib examples.bak
-pause
-copy .\bib\ex*.bib .\bib\examples.bib
-pause
-
-for %%f in (ugost7*.tex) do pdflatex -quiet %%f 
-for %%f in (ugost200*.tex) do pdflatex -quiet %%f 
-
-REM pause
-for %%f in (ugost*.aux) do bibtex8 -B -c utf8cyrillic.csf %%f 
-
-REM pause
-for %%f in (ugost7*.tex) do pdflatex %%f 
-for %%f in (ugost200*.tex) do pdflatex %%f 
-for %%f in (ugost2008-nat*.tex) do pdflatex %%f 
-for %%f in (ugost2008-sort*.tex) do pdflatex %%f 
-
-del *.aux *.out *.toc *.brf .pdf
-del *.bbl 
-del *.blg 
-del *.log

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/donat.cmd	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,13 +0,0 @@
-for %%f in (ugost2008-natbib*.tex) do pdflatex -quiet %%f 
-
-REM pause
-for %%f in (ugost2008-natbib*.aux) do bibtex8 -B -c utf8cyrillic.csf %%f 
-
-REM pause
-for %%f in (ugost2008-natbib*.tex) do pdflatex %%f 
-for %%f in (ugost2008-natbib*.tex) do pdflatex %%f 
-
-del *.aux *.out *.toc *.brf .pdf
-REM del *.bbl 
-REM del *.blg 
-del *.log

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/gost2008-natbib-s.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/gost2008-natbib-s.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/doc/examples/utf8/gost2008-natbib-s.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,122 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-\newcommand*{\mybibstyle}{gost2008ns}
-
-\RequirePackage[utf8]{inputenc}
-
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
-   and \texttt{natbib} package.
-   No customization is applied.
-
-   Пример оформления списка литературы с помощью стиля 
-   \texttt{\mybibstyle.bst} и пакета \texttt{natbib}.
-   Команды форматирования не изменены.
-}
-
-\documentclass[a4paper]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T2A]{fontenc}
-\usepackage[ukrainian,russian]{babel}
-\usepackage{natbib}
-\usepackage{geometry,ifpdf}
-\ifpdf
-  \usepackage[pdftex,hyperindex,unicode]{hyperref}
-  \usepackage{cmap}
-\else
-  \usepackage[hypertex]{hyperref}
-\fi
-\usepackage{color}
-\definecolor{darkblue}{rgb}{0,0,.6}
-\hypersetup{
-  pdftitle           = {\mytitle},
-  pdfauthor          = {Igor A. Kotelnikov},
-  pdfsubject         = {GOST, BibTeX},
-  pdfstartview       = {FitH},
-%  pdfborder          = {0 0 0},
-%  bookmarksopen      = true,
-  bookmarksnumbered  = true,
-%  bookmarksopenlevel = 2,
-  colorlinks = true,     linkcolor  = darkblue,
-  citecolor  = darkblue, filecolor  = darkblue,
-  menucolor  = darkblue, urlcolor   = darkblue
-}
-
-\makeatletter
-\renewcommand{\@biblabel}[1]{#1.}
-\makeatother		
-		
-\begin{document}
-
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
-%\verb|\cite{*}| \cite{*}
-%
-%\verb|\citep{*}| \citep{*}
-%
-%\verb|\citet{*}| \citet{*}
-
-\newcommand{\allrefs}{Vasylenko92,
-Afanasyev92,
-Makilov91,
-Ponomarenko86,
-Belousova81,
-BibOp91,
-Poems82,
-HistLit82,
-Landau:eldin,
-BRLS94,
-Grosse80,
-GOST7184,
-ObchTech93,
-Bibdelo86,
-Ponomarenko79,
-Zeyts70,
-Ponoomarenko76,
-Malikov92,
-Ponomarenko86a,
-dixit.pindyck:options,
-RosGaz-article,
-Dolmatovskiy88,
-Ponomarenko88,
-Melikov95, Selikov95, Selikov+95,
-Gojchuk98,
-Polyakov98a,
-TranskSpivrob99:Purich,
-Luus82,
-KIA95-default,
-KIA85-autoref,
-Ponomarenko76,
-Report81-rep,
-Report81b-rep-notype,
-Report81-techrep,
-CatalogMamals81,
-Instr86,
-wiki:latex,
-wiki:latex-2,
-phys:moodle,
-EXFOR,
-IsaacNewton,
-IsaacNewton-sl:sn,
-PhysRevLett.101.085006}
-
-
-\verb|\citep|\par \citep{\allrefs}
-
-\verb|\citep*|\par \citep{\allrefs}
-
-\verb|\citeauthor|\par \citeauthor{\allrefs}
-
-\verb|\citeauthor*|\par \citeauthor*{\allrefs}
-
-
-\bibliographystyle{\mybibstyle}  
-\bibliography{bib/examples}     
-
-\end{document} 
-
-

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/donat.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/donat.cmd	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/donat.cmd	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,13 +0,0 @@
-for %%f in (gost2008-natbib*.tex) do pdflatex -quiet %%f 
-
-REM pause
-for %%f in (gost2008-natbib*.aux) do bibtex8 -B -c cp1251.csf %%f 
-
-REM pause
-for %%f in (gost2008-natbib*.tex) do pdflatex %%f 
-for %%f in (gost2008-natbib*.tex) do pdflatex %%f 
-
-del *.aux *.out *.toc *.brf .pdf
-REM del *.bbl 
-REM del *.blg 
-del *.log

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex01.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex01.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex01.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @BOOK{Vasylenko92,
-    author = "\xC2\xE0\xF1\xE8\xEB\xE5\xED\xEA\xEE, \xCC. \xC2.",
-    title = "\xD2\xE5\xEE\xF0\xB3\xFF \xEA\xEE\xEB\xE8\xE2\xE0\xED\xFC: \xCD\xE0\xE2\xF7\xE0\xEB\xFC\xED\xE8\xE9 \xEF\xEE\xF1\xB3\xE1\xED\xE8\xEA",
-    address = "\xCA.",
-    publisher = "\xC2\xE8\xF9\xE0 \xF8\xEA\xEE\xEB\xE0",
-    year = 1992,
-    pagetotal = 430,
-    language = "ukrainian"
+  author       = {\xC2\xE0\xF1\xE8\xEB\xE5\xED\xEA\xEE, \xCC. \xC2.},
+  title        = {\xD2\xE5\xEE\xF0\xB3\xFF \xEA\xEE\xEB\xE8\xE2\xE0\xED\xFC: \xCD\xE0\xE2\xF7\xE0\xEB\xFC\xED\xE8\xE9 \xEF\xEE\xF1\xB3\xE1\xED\xE8\xEA},
+  address      = {\xCA.},
+  publisher    = {\xC2\xE8\xF9\xE0 \xF8\xEA\xEE\xEB\xE0},
+  year         = {1992},
+  pagetotal    = {430},
+  language     = {ukrainian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex02.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex02.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex02.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @BOOK{Afanasyev92,
-    author = "\xC0\xF4\xE0\xED\xE0\xF1\xFC\xE5\xE2, \xC2. \xC2. and \xC2\xE0\xF1\xE8\xEB\xE5\xE2\xF1\xEA\xE8\xE9, \xCE. \xCD.",
-    title = "\xD0\xE0\xF1\xF7\xE5\xF2\xFB \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF6\xE5\xEF\xE5\xE9 
-      \xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xEC\xE8\xEA\xF0\xEE\xEA\xE0\xEB\xFC\xEA\xF3\xEB\xFF\xF2\xEE\xF0\xE0\xF5",
-    address = "\xCC.",
-    publisher = "\xDD\xED\xE5\xF0\xE3\xEE\xE8\xE7\xE4\xE0\xF2",
-    year = 1992,
-    pagetotal = 190,
-    language = "russian"
+  author       = {\xC0\xF4\xE0\xED\xE0\xF1\xFC\xE5\xE2, \xC2. \xC2. and \xC2\xE0\xF1\xE8\xEB\xE5\xE2\xF1\xEA\xE8\xE9, \xCE. \xCD.},
+  title        = {\xD0\xE0\xF1\xF7\xE5\xF2\xFB \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF6\xE5\xEF\xE5\xE9
+                  \xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xEC\xE8\xEA\xF0\xEE\xEA\xE0\xEB\xFC\xEA\xF3\xEB\xFF\xF2\xEE\xF0\xE0\xF5},
+  address      = {\xCC.},
+  publisher    = {\xDD\xED\xE5\xF0\xE3\xEE\xE8\xE7\xE4\xE0\xF2},
+  year         = {1992},
+  pagetotal    = {190},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex03.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex03.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex03.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Makilov91,
-    author = "\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. 
-      and \xD0\xFE\xEC\xF8\xE8\xED, \xCF. \xC0.",
-    title = "\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xEC\xED\xEE\xE3\xEE\xEF\xEE\xF2\xEE\xEA\xEE\xE2\xFB\xF5 
-      \xF1\xE8\xF1\xF2\xE5\xEC \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF",
-    address = "\xCA.",
-    publisher = "\xD2\xE5\xF5\xED\xB3\xEA\xE0",
-    year = 1991,
-    pagetotal = 265,
-    language = "russian"
+  author       = {\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.
+                  and \xD0\xFE\xEC\xF8\xE8\xED, \xCF. \xC0.},
+  title        = {\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xEC\xED\xEE\xE3\xEE\xEF\xEE\xF2\xEE\xEA\xEE\xE2\xFB\xF5
+                  \xF1\xE8\xF1\xF2\xE5\xEC \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF},
+  address      = {\xCA.},
+  publisher    = {\xD2\xE5\xF5\xED\xB3\xEA\xE0},
+  year         = {1991},
+  pagetotal    = {265},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex04.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex04.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex04.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Ponomarenko86,
-  title = "\xCE\xF1\xED\xEE\xE2\xFB \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xE1\xEA\xE8\xF5 \xE0\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2",
-  author = "\xCB. \xC0. \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE and \xCB. \xC2. \xC0\xE4\xE0\xEC\xEE\xE2\xE8\xF7 
-    and \xC2. \xD2. \xCC\xF3\xE7\xFB\xF7\xF3\xEA and  \xC0. \xC5. \xC3\xF0\xE8\xE4\xE0\xF1\xEE\xE2",
-  editor = "\xC1. \xC1. \xD2\xE8\xEC\xEE\xF4\xE5\xE5\xE2\xE0",
-  address   = "\xCA.",
-  publisher = "\xD2\xE5\xF5\xED\xB3\xEA\xE0",
-  year = 1986,
-  pagetotal = 144,
-  language = "russian"
+  title        = {\xCE\xF1\xED\xEE\xE2\xFB \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xE1\xEA\xE8\xF5 \xE0\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2},
+  author       = {\xCB. \xC0. \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE and \xCB. \xC2. \xC0\xE4\xE0\xEC\xEE\xE2\xE8\xF7
+                  and \xC2. \xD2. \xCC\xF3\xE7\xFB\xF7\xF3\xEA and  \xC0. \xC5. \xC3\xF0\xE8\xE4\xE0\xF1\xEE\xE2},
+  editor       = {\xC1. \xC1. \xD2\xE8\xEC\xEE\xF4\xE5\xE5\xE2\xE0},
+  address      = {\xCA.},
+  publisher    = {\xD2\xE5\xF5\xED\xB3\xEA\xE0},
+  year         = {1986},
+  pagetotal    = {144},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex05.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex05.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex05.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Belousova81,
-  title = "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xFB\xE9 \xE0\xED\xE0\xEB\xE8\xE7 \xE8\xED\xF4\xF0\xE0\xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xFB 
-    \xEA\xE0\xEA \xFD\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE0\xF0\xEE\xE4\xED\xEE\xE3\xEE \xF5\xEE\xE7\xFF\xE9\xF1\xF2\xE2\xE0",
-  author = "\xC1\xE5\xEB\xEE\xF3\xF1\xEE\xE2\xE0, \xCD. \xC8. and \xC2\xE8\xF8\xED\xFF\xEA, \xC5. \xC8. 
-    and \xCB\xE5\xE2\xE8\xF2, \xC2. \xDE. and others",
-  address   = "\xCC.",
-  publisher = "\xDD\xEA\xEE\xED\xEE\xEC\xE8\xEA\xE0",
-  year = 1981,
-  pagetotal = 62,
-  language = "russian"
-}
\ No newline at end of file
+  title        = {\xD1\xE8\xF1\xF2\xE5\xEC\xED\xFB\xE9 \xE0\xED\xE0\xEB\xE8\xE7 \xE8\xED\xF4\xF0\xE0\xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xFB
+                  \xEA\xE0\xEA \xFD\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE0\xF0\xEE\xE4\xED\xEE\xE3\xEE \xF5\xEE\xE7\xFF\xE9\xF1\xF2\xE2\xE0},
+  author       = {\xC1\xE5\xEB\xEE\xF3\xF1\xEE\xE2\xE0, \xCD. \xC8. and \xC2\xE8\xF8\xED\xFF\xEA, \xC5. \xC8.
+                  and \xCB\xE5\xE2\xE8\xF2, \xC2. \xDE. and others},
+  address      = {\xCC.},
+  publisher    = {\xDD\xEA\xEE\xED\xEE\xEC\xE8\xEA\xE0},
+  year         = {1981},
+  pagetotal    = {62},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex06.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex06.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex06.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @BOOK{BibOp91,
-    title = "\xD1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xEE\xEF\xE8\xF1\xE0\xED\xE8\xFF: 
-      \xCA\xF0\xE0\xF2\xEA\xE8\xE5 \xEF\xF0\xE0\xE2\xE8\xEB\xE0",
-    organization = "\xCC\xE5\xE6\xE4\xF3\xE2\xE5\xE4. \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE8\xE7\xE0\xF6. \xEA\xEE\xEC\xE8\xF1. 
-      \xEF\xF0\xE8 \xC3\xEE\xF1. \xE1-\xEA\xE5 \xD1\xD1\xD1\xD0 \xE8\xEC.~\xC2.~\xC8. \xCB\xE5\xED\xE8\xED\xE0",
-    edition = "2-\xE5, \xE4\xEE\xEF.",
-    address   = "\xCC.",
-    publisher = "\xCA\xED.~\xEF\xE0\xEB\xE0\xF2\xE0",
-    year = 1991,
-    pagetotal = 224,
-    language = "russian"
+  title        = {\xD1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xEE\xEF\xE8\xF1\xE0\xED\xE8\xFF:
+                  \xCA\xF0\xE0\xF2\xEA\xE8\xE5 \xEF\xF0\xE0\xE2\xE8\xEB\xE0},
+  organization = {\xCC\xE5\xE6\xE4\xF3\xE2\xE5\xE4. \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE8\xE7\xE0\xF6. \xEA\xEE\xEC\xE8\xF1.
+                  \xEF\xF0\xE8 \xC3\xEE\xF1. \xE1-\xEA\xE5 \xD1\xD1\xD1\xD0 \xE8\xEC.~\xC2.~\xC8. \xCB\xE5\xED\xE8\xED\xE0},
+  edition      = {2-\xE5, \xE4\xEE\xEF.},
+  address      = {\xCC.},
+  publisher    = {\xCA\xED.~\xEF\xE0\xEB\xE0\xF2\xE0},
+  year         = {1991},
+  pagetotal    = {224},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex06a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex06a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex06a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @BOOK{Poems82,
-    title = "\xD1\xF2\xE8\xF5\xE8 \xEE \xEC\xF3\xE7\xFB\xEA\xE5. \xD0\xF3\xF1\xF1\xEA\xE8\xE5, 
-      \xF1\xEE\xE2\xE5\xF2\xF1\xEA\xE8\xE5, \xE7\xE0\xF0\xF3\xE1\xE5\xE6\xED\xFB\xE5 \xEF\xEE\xFD\xF2\xFB: \xD1\xE1\xEE\xF0\xED\xE8\xEA",
-    compiler = "\xC0. \xC1\xE8\xF0\xFE\xEA\xEE\xE2\xE0 and \xC2. \xD2\xE0\xF2\xE0\xF0\xE8\xED\xEE\xE2",
-    address   = "\xCC.",
-    publisher = "\xD1\xEE\xE2. \xEA\xEE\xEC\xEF\xEE\xE7\xE8\xF2\xEE\xF0",
-    year = 1982,
-    pagetotal = 224,
-    language = "russian"
+  title        = {\xD1\xF2\xE8\xF5\xE8 \xEE \xEC\xF3\xE7\xFB\xEA\xE5. \xD0\xF3\xF1\xF1\xEA\xE8\xE5,
+                  \xF1\xEE\xE2\xE5\xF2\xF1\xEA\xE8\xE5, \xE7\xE0\xF0\xF3\xE1\xE5\xE6\xED\xFB\xE5 \xEF\xEE\xFD\xF2\xFB: \xD1\xE1\xEE\xF0\xED\xE8\xEA},
+  compiler     = {\xC0. \xC1\xE8\xF0\xFE\xEA\xEE\xE2\xE0 and \xC2. \xD2\xE0\xF2\xE0\xF0\xE8\xED\xEE\xE2},
+  address      = {\xCC.},
+  publisher    = {\xD1\xEE\xE2. \xEA\xEE\xEC\xEF\xEE\xE7\xE8\xF2\xEE\xF0},
+  year         = {1982},
+  pagetotal    = {224},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex07.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex07.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex07.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @BOOK{HistLit82,
-    title = "\xC8\xF1\xF2\xEE\xF0\xE8\xFF \xF0\xF3\xF1\xF1\xEA\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB: \xC2 4 \xF2.",
-    organization = "\xC0\xCD \xD1\xD1\xD1\xD0, \xC8\xED-\xF2 \xF0\xF3\xF1.~\xEB\xE8\xF2.\ (\xCF\xF3\xF8\xEA\xE8\xED.\xE4\xEE\xEC)",
-    address   = "\xCC.",
-    year = 1982,
-    Volume = "3: \xD0\xE0\xF1\xF6\xE2\xE5\xF2 \xF0\xE5\xE0\xEB\xE8\xE7\xEC\xE0",
-    pagetotal = 876,
-    language = "russian"
-}
\ No newline at end of file
+  title        = {\xC8\xF1\xF2\xEE\xF0\xE8\xFF \xF0\xF3\xF1\xF1\xEA\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB: \xC2 4 \xF2.},
+  organization = {\xC0\xCD \xD1\xD1\xD1\xD0, \xC8\xED-\xF2 \xF0\xF3\xF1.~\xEB\xE8\xF2.\ (\xCF\xF3\xF8\xEA\xE8\xED.\xE4\xEE\xEC)},
+  address      = {\xCC.},
+  year         = {1982},
+  volume       = {3: \xD0\xE0\xF1\xF6\xE2\xE5\xF2 \xF0\xE5\xE0\xEB\xE8\xE7\xEC\xE0},
+  pagetotal    = {876},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex08.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex08.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex08.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
- at Book{Landau:eldin,
-    author  = "\xCB. \xC4. \xCB\xE0\xED\xE4\xE0\xF3 and \xC5. \xCC. \xCB\xE8\xF4\xF8\xE8\xF6",
-    title   = "\xD2\xE5\xEE\xF0\xE5\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF4\xE8\xE7\xE8\xEA\xE0: \xF3\xF7\xE5\xE1\xED\xEE\xE5 \xEF\xEE\xF1\xEE\xE1\xE8\xE5 \xE2 10 \xF2.",
-    publisher       = "\xCD\xE0\xF3\xEA\xE0. \xC3\xEB.\ \xF0\xE5\xE4.\ \xF4\xE8\xE7.-\xEC\xE0\xF2.\ \xEB\xE8\xF2.",
-    address = "\xCC.",
-    year    = 1992,
-    volume  = "VIII. \xDD\xEB\xE5\xEA\xF2\xF0\xEE\xE4\xE8\xED\xE0\xEC\xE8\xEA\xE0 \xF1\xEF\xEB\xEE\xF8\xED\xFB\xF5 \xF1\xF0\xE5\xE4",
-    edition = "3-\xE5, \xE8\xF1\xEF\xF0.",
-    language = "russian"
+ at BOOK{Landau:eldin,
+  author       = {\xCB. \xC4. \xCB\xE0\xED\xE4\xE0\xF3 and \xC5. \xCC. \xCB\xE8\xF4\xF8\xE8\xF6},
+  title        = {\xD2\xE5\xEE\xF0\xE5\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF4\xE8\xE7\xE8\xEA\xE0: \xF3\xF7\xE5\xE1\xED\xEE\xE5 \xEF\xEE\xF1\xEE\xE1\xE8\xE5 \xE2 10 \xF2.},
+  publisher    = {\xCD\xE0\xF3\xEA\xE0. \xC3\xEB.\ \xF0\xE5\xE4.\ \xF4\xE8\xE7.-\xEC\xE0\xF2.\ \xEB\xE8\xF2.},
+  address      = {\xCC.},
+  year         = {1992},
+  volume       = {VIII. \xDD\xEB\xE5\xEA\xF2\xF0\xEE\xE4\xE8\xED\xE0\xEC\xE8\xEA\xE0 \xF1\xEF\xEB\xEE\xF8\xED\xFB\xF5 \xF1\xF0\xE5\xE4},
+  edition      = {3-\xE5, \xE8\xF1\xEF\xF0.},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex09.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex09.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex09.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
- at Book{BRLS94,
-  title      = "\xCD\xE0\xF0\xFB\xF1\xFB \xEF\xE0 \xE3i\xF1\xF2\xEE\xF0\xFBi \xE1\xE5\xEB\xE0\xF0\xF3\xF1\xEA\xE0-\xF0\xF3\xF1\xEAi\xF5 
-    \xEBi\xF2\xE0\xF0\xE0\xF2\xF3\xF0\xED\xFB\xF5 \xF1\xF3\xE2\xFF\xE7\xE5\xE9: \xD3 4 \xEA\xED.",
-  organization = "\xC0\xEA\xE0\xE4.\ \xED\xE0\xE2\xF3\xEA \xC1\xE5\xEB\xE0\xF0\xF3\xF1i. I\xED-\xF2 \xEBi\xF2.",
-  address = "\xCCi\xED\xF1\xEA",
-  publisher = "\xCD\xE0\xE2\xF3\xEA\xE0 i \xF2\xFD\xF5\xEDi\xEA\xE0",
-  year = "1994",
-  volume = "2: \xCF\xE0\xF7\xE0\xF2\xE0\xEA \xD5\xD5 \xF1\xF2. 1900--1917 \xE3\xE3.",
-  editor = "\xC2. \xC0. \xCA\xE0\xE2\xE0\xEB\xE5\xED\xEA\xE0 and I. \xDF. \xCD\xE0\xE2\xF3\xEC\xE5\xED\xEA\xE0",
-  pagetotal = 440,
-  language = "russian"
-}
\ No newline at end of file
+ at BOOK{BRLS94,
+  title        = {\xCD\xE0\xF0\xFB\xF1\xFB \xEF\xE0 \xE3i\xF1\xF2\xEE\xF0\xFBi \xE1\xE5\xEB\xE0\xF0\xF3\xF1\xEA\xE0-\xF0\xF3\xF1\xEAi\xF5
+                  \xEBi\xF2\xE0\xF0\xE0\xF2\xF3\xF0\xED\xFB\xF5 \xF1\xF3\xE2\xFF\xE7\xE5\xE9: \xD3 4 \xEA\xED.},
+  organization = {\xC0\xEA\xE0\xE4.\ \xED\xE0\xE2\xF3\xEA \xC1\xE5\xEB\xE0\xF0\xF3\xF1i. I\xED-\xF2 \xEBi\xF2.},
+  address      = {\xCCi\xED\xF1\xEA},
+  publisher    = {\xCD\xE0\xE2\xF3\xEA\xE0 i \xF2\xFD\xF5\xEDi\xEA\xE0},
+  year         = {1994},
+  volume       = {2: \xCF\xE0\xF7\xE0\xF2\xE0\xEA \xD5\xD5 \xF1\xF2. 1900--1917 \xE3\xE3.},
+  editor       = {\xC2. \xC0. \xCA\xE0\xE2\xE0\xEB\xE5\xED\xEA\xE0 and I. \xDF. \xCD\xE0\xE2\xF3\xEC\xE5\xED\xEA\xE0},
+  pagetotal    = {440},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex10.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex10.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex10.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @BOOK{Grosse80,
-    author = "\xC3\xF0\xEE\xF1\xF1\xE5, \xDD. and \xC2\xE0\xE9\xF1\xEC\xE0\xED\xE3\xE5\xEB\xFC, \xD5.",
-    title = "\xD5\xE8\xEC\xE8\xFF \xE4\xEB\xFF \xEB\xFE\xE1\xEE\xE7\xED\xE0\xF2\xE5\xEB\xFC\xED\xFB\xF5: \xCF\xE5\xF0.\ \xF1 \xED\xE5\xEC.",
-    address   = "\xCC.",
-    publisher = "\xD5\xE8\xEC\xE8\xFF",
-    year = 1980,
-    pagetotal = 392,
-    language = "russian"
-}
\ No newline at end of file
+  author       = {\xC3\xF0\xEE\xF1\xF1\xE5, \xDD. and \xC2\xE0\xE9\xF1\xEC\xE0\xED\xE3\xE5\xEB\xFC, \xD5.},
+  title        = {\xD5\xE8\xEC\xE8\xFF \xE4\xEB\xFF \xEB\xFE\xE1\xEE\xE7\xED\xE0\xF2\xE5\xEB\xFC\xED\xFB\xF5: \xCF\xE5\xF0.\ \xF1 \xED\xE5\xEC.},
+  address      = {\xCC.},
+  publisher    = {\xD5\xE8\xEC\xE8\xFF},
+  year         = {1980},
+  pagetotal    = {392},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex11.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex11.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex11.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{GOST7184,
-    key = {\xC3\xCE\xD1\xD2},
-    title = "\xC3\xCE\xD1\xD2 7.1.-84. \xC1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE5 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0. 
-      \xCE\xE1\xF9\xE8\xE5 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xF1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xFF. 
-      --- \xC2\xE7\xE0\xEC\xE5\xED \xC3\xCE\xD1\xD2 7.1.-76; \xC2\xE2\xE5\xE4. 01.01.86.",
-    address   = "\xCC.",
-    publisher = "\xC8\xE7\xE4-\xE2\xEE \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xEE\xE2",
-    year = 1984,
-    pagetotal = 78,
-    language = "russian"
-}
\ No newline at end of file
+  key          = {\xC3\xCE\xD1\xD2},
+  title        = {\xC3\xCE\xD1\xD2 7.1-84. \xC1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE5 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0.
+                  \xCE\xE1\xF9\xE8\xE5 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xF1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xFF.
+                  --- \xC2\xE7\xE0\xEC\xE5\xED \xC3\xCE\xD1\xD2 7.1-76~; \xE2\xE2\xE5\xE4. 01.01.86.},
+  address      = {\xCC.},
+  publisher    = {\xC8\xE7\xE4-\xE2\xEE \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xEE\xE2},
+  year         = {1984},
+  pagetotal    = {78},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex12.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex12.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex12.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,8 +1,8 @@
 @BOOK{ObchTech93,
-    title = "\xCE\xE1\xF7\xE8\xF1\xEB\xFE\xE2\xE0\xEB\xFC\xED\xE0 \xB3 \xEF\xF0\xE8\xEA\xEB\xE0\xE4\xED\xE0 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xEA\xE0: \xC7\xE1.\xED\xE0\xF3\xEA.\xEF\xF0.",
-    address   = "\xCA.",
-    publisher = "\xCB\xE8\xE1\xB3\xE4\xFC",
-    year = 1993,
-    pagetotal = 99,
-    language = "ukrainian"
-}
\ No newline at end of file
+  title        = {\xCE\xE1\xF7\xE8\xF1\xEB\xFE\xE2\xE0\xEB\xFC\xED\xE0 \xB3 \xEF\xF0\xE8\xEA\xEB\xE0\xE4\xED\xE0 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xEA\xE0: \xC7\xE1.\xED\xE0\xF3\xEA.\xEF\xF0.},
+  address      = {\xCA.},
+  publisher    = {\xCB\xE8\xE1\xB3\xE4\xFC},
+  year         = {1993},
+  pagetotal    = {99},
+  language     = {ukrainian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex13.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex13.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex13.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @BOOK{Bibdelo86,
-    title = "\xC1\xE8\xE1\xEB\xE8\xEE\xF2\xE5\xF7\xED\xEE\xE5 \xE4\xE5\xEB\xEE: \xD2\xE5\xF0\xEC\xE8\xED\xEE\xEB. \xF1\xEB\xEE\xE2\xE0\xF0\xFC",
-    composer = "\xC8. \xCC. \xD1\xF3\xF1\xEB\xEE\xE2\xE0  and \xCB. \xCD. \xD3\xEB\xE0\xED\xEE\xE2\xE0",
-    edition = "2-\xE5 \xE8\xE7\xE4.",
-    address   = "\xCC.",
-    publisher = "\xCA\xED\xE8\xE3\xE0",
-    year = 1986,
-    pagetotal = 224,
-    language = "russian"
-}
\ No newline at end of file
+  title        = {\xC1\xE8\xE1\xEB\xE8\xEE\xF2\xE5\xF7\xED\xEE\xE5 \xE4\xE5\xEB\xEE: \xD2\xE5\xF0\xEC\xE8\xED\xEE\xEB. \xF1\xEB\xEE\xE2\xE0\xF0\xFC},
+  composer     = {\xC8. \xCC. \xD1\xF3\xF1\xEB\xEE\xE2\xE0  and \xCB. \xCD. \xD3\xEB\xE0\xED\xEE\xE2\xE0},
+  edition      = {2-\xE5 \xE8\xE7\xE4.},
+  address      = {\xCC.},
+  publisher    = {\xCA\xED\xE8\xE3\xE0},
+  year         = {1986},
+  pagetotal    = {224},
+  language     = {russian},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex14.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex14.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex14.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @INBOOK{Ponomarenko79,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.",
-    title = "\xCE\xF0\xE3\xE0\xED\xE8\xE7\xF3\xFE\xF9\xE0\xFF \xF1\xE8\xF1\xF2\xE5\xEC\xE0",
-    booktitle = "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xFF \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xEE\xE2 
-      \xE2 \xEF\xF0\xEE\xEA\xE0\xF2\xED\xEE\xEC \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2\xE5",
-    address   = "\xCC.",
-    publisher = "\xCC\xE5\xF2\xE0\xEB\xEB\xF3\xF0\xE3\xE8\xFF",
-    year = 1979,
-    pages = "141-148",
-    language = "russian"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.},
+  title        = {\xCE\xF0\xE3\xE0\xED\xE8\xE7\xF3\xFE\xF9\xE0\xFF \xF1\xE8\xF1\xF2\xE5\xEC\xE0},
+  booktitle    = {\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xFF \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xEE\xE2
+                  \xE2 \xEF\xF0\xEE\xEA\xE0\xF2\xED\xEE\xEC \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2\xE5},
+  address      = {\xCC.},
+  publisher    = {\xCC\xE5\xF2\xE0\xEB\xEB\xF3\xF0\xE3\xE8\xFF},
+  year         = {1979},
+  pages        = {141-148},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex14a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex14a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex14a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @INBOOK{Zeyts70,
-    author = "\xC7\xE5\xE9\xF2\xF6, \xD4.",
-    title = "\xCE \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xE8\xE8 \xEF\xF0\xEE\xF1\xF2\xF0\xE0\xED\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xE3\xF0\xF3\xEF\xEF",
-    booktitle = "\xD1\xE8\xEC\xEC\xE5\xF2\xF0\xE8\xFF \xE2 \xF2\xE2\xE5\xF0\xE4\xEE\xEC \xF2\xE5\xEB\xE5",
-    bookauthor = "\xCD\xEE\xEA\xF1, \xD0. and \xC3\xEE\xEB\xE4, \xC0.",
-    address   = "\xCC.",
-    publisher = "\xCD\xE0\xF3\xEA\xE0",
-    year = 1970,
-    pages = "172--186",
-    language = "russian"
+  author       = {\xC7\xE5\xE9\xF2\xF6, \xD4.},
+  title        = {\xCE \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xE8\xE8 \xEF\xF0\xEE\xF1\xF2\xF0\xE0\xED\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xE3\xF0\xF3\xEF\xEF},
+  booktitle    = {\xD1\xE8\xEC\xEC\xE5\xF2\xF0\xE8\xFF \xE2 \xF2\xE2\xE5\xF0\xE4\xEE\xEC \xF2\xE5\xEB\xE5},
+  bookauthor   = {\xCD\xEE\xEA\xF1, \xD0. and \xC3\xEE\xEB\xE4, \xC0.},
+  address      = {\xCC.},
+  publisher    = {\xCD\xE0\xF3\xEA\xE0},
+  year         = {1970},
+  pages        = {172--186},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex15.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex15.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex15.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @INCOLLECTION{Ponoomarenko76,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.",
-    title = "\xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xEF\xF0\xE5\xF0\xFB\xE2\xE0\xED\xE8\xFF \xF1 \xF1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xEC\xE8
-      \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xE0\xEC\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8",
-    booktitle = "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xEA\xE0 \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xF1\xE8\xF1\xF2\xE5\xEC \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF 
-      \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xEC\xE8 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xE0\xEC\xE8",
-    address   = "\xD2\xE1\xE8\xEB\xE8\xF1\xE8",
-    publisher = "\xD1\xE0\xE1\xF7\xEE\xF2\xE0 \xD1\xE0\xEA\xE0\xF0\xF2\xE2\xE5\xEB\xEE",
-    year = 1976,
-    pages = "3-16",
-    language = "russian"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.},
+  title        = {\xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xEF\xF0\xE5\xF0\xFB\xE2\xE0\xED\xE8\xFF \xF1 \xF1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xEC\xE8
+                  \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xE0\xEC\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8},
+  booktitle    = {\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xEA\xE0 \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xF1\xE8\xF1\xF2\xE5\xEC \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF
+                  \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xEC\xE8 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xE0\xEC\xE8},
+  address      = {\xD2\xE1\xE8\xEB\xE8\xF1\xE8},
+  publisher    = {\xD1\xE0\xE1\xF7\xEE\xF2\xE0 \xD1\xE0\xEA\xE0\xF0\xF2\xE2\xE5\xEB\xEE},
+  year         = {1976},
+  pages        = {3-16},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex16.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex16.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex16.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
- at Article{Malikov92,
-    author = "\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.",
-    title = "\xCE\xEF\xF2\xE8\xEC\xE8\xE7\xE0\xF6\xE8\xFF \xF6\xE8\xF4\xF0\xEE\xE2\xEE\xE9 \xF1\xE5\xF2\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xFC\xED\xEE\xE3\xEE \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF 
-      \xF1 \xEA\xEE\xED\xE5\xF7\xED\xFB\xEC \xF7\xE8\xF1\xEB\xEE\xEC \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9 \xE8 \xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xEA\xE0\xEC\xE8",
-    journal = "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xEA\xE0 \xE8 \xF2\xE5\xEB\xE5\xEC\xE5\xF5\xE0\xED\xE8\xEA\xE0",
-    year = 1992,
-    number =  6,
-    pages = "34-38",
-    language = "russian"
+ at ARTICLE{Malikov92,
+  author       = {\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.},
+  title        = {\xCE\xEF\xF2\xE8\xEC\xE8\xE7\xE0\xF6\xE8\xFF \xF6\xE8\xF4\xF0\xEE\xE2\xEE\xE9 \xF1\xE5\xF2\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xFC\xED\xEE\xE3\xEE \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF
+                  \xF1 \xEA\xEE\xED\xE5\xF7\xED\xFB\xEC \xF7\xE8\xF1\xEB\xEE\xEC \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9 \xE8 \xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xEA\xE0\xEC\xE8},
+  journal      = {\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xEA\xE0 \xE8 \xF2\xE5\xEB\xE5\xEC\xE5\xF5\xE0\xED\xE8\xEA\xE0},
+  year         = {1992},
+  number       = {6},
+  pages        = {34-38},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex17.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex17.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex17.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
- at Article{Ponomarenko86a,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7.",
-    title = "\xD1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xEE\xE5 \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xEC\xED\xEE\xE3\xEE\xEA\xE0\xED\xE0\xEB\xFC\xED\xEE\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xEE\xE9 
-      \xF1 \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xEE\xE9 \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF \xED\xE5\xEE\xE4\xED\xEE\xF0\xEE\xE4\xED\xEE\xE3\xEE \xEF\xEE\xF2\xEE\xEA\xE0",
-    journal = "\xC8\xE7\xE2.\ \xC0\xCD \xC0\xE7\xE5\xF0\xE1.\ \xD0\xE5\xF1\xEF. \xD1\xE5\xF0.\ \xF4\xE8\xE7.-\xF2\xE5\xF5\xED.\ \xE8 \xEC\xE0\xF2.\ \xED\xE0\xF3\xEA",
-    year = 1986,
-    volume = 7,
-    number = 6,
-    pages = "79-83",
-    language = "russian"
+ at ARTICLE{Ponomarenko86a,
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7.},
+  title        = {\xD1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xEE\xE5 \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xEC\xED\xEE\xE3\xEE\xEA\xE0\xED\xE0\xEB\xFC\xED\xEE\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xEE\xE9
+                  \xF1 \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xEE\xE9 \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF \xED\xE5\xEE\xE4\xED\xEE\xF0\xEE\xE4\xED\xEE\xE3\xEE \xEF\xEE\xF2\xEE\xEA\xE0},
+  journal      = {\xC8\xE7\xE2.\ \xC0\xCD \xC0\xE7\xE5\xF0\xE1.\ \xD0\xE5\xF1\xEF. \xD1\xE5\xF0.\ \xF4\xE8\xE7.-\xF2\xE5\xF5\xED.\ \xE8 \xEC\xE0\xF2.\ \xED\xE0\xF3\xEA},
+  year         = {1986},
+  volume       = {7},
+  number       = {6},
+  pages        = {79-83},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex17a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex17a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex17a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,8 +1,8 @@
- at Article{   dixit.pindyck:options,
-  title = {The Options Approach to Capital Investment},
-  author = {Avinash K. Dixit and Robert S. Pindyck},
-  journal = {Harvard Business Review},
-  year = {1995},
-  month = {May-June},
-  pages = {105--115}
+ at ARTICLE{dixit.pindyck:options,
+  title        = {The Options Approach to Capital Investment},
+  author       = {Avinash K. Dixit and Robert S. Pindyck},
+  journal      = {Harvard Business Review},
+  year         = {1995},
+  month        = {May-June},
+  pages        = {105--115},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex17b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex17b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex17b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
 @ARTICLE{RosGaz-article,
-    title = "\xD4\xE5\xE4\xE5\xF0\xE0\xEB\xFC\xED\xFB\xE9 \xE7\xE0\xEA\xEE\xED \xEE \xE2\xED\xE5\xF1\xE5\xED\xE8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE9 
-      \xE8 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE9 \xE2 \xD1\xE5\xEC\xE5\xE9\xED\xFB\xE9 \xEA\xEE\xE4\xE5\xEA\xF1 \xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xEE\xE9 \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xE8",
-    journal = "\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xE3\xE0\xE7\xE5\xF2\xE0",
-    year = 1997,
-    month = "19 \xED\xEE\xFF\xE1",
-    pages = 4,
-    note = "\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF. \xC7\xE0\xEA\xEE\xED\xFB",
-    language = "russian"
+  title        = {\xD4\xE5\xE4\xE5\xF0\xE0\xEB\xFC\xED\xFB\xE9 \xE7\xE0\xEA\xEE\xED \xEE \xE2\xED\xE5\xF1\xE5\xED\xE8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE9
+                  \xE8 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE9 \xE2 \xD1\xE5\xEC\xE5\xE9\xED\xFB\xE9 \xEA\xEE\xE4\xE5\xEA\xF1 \xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xEE\xE9 \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xE8},
+  journal      = {\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xE3\xE0\xE7\xE5\xF2\xE0},
+  year         = {1997},
+  month        = {19 \xED\xEE\xFF\xE1},
+  pages        = {4},
+  note         = {\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF. \xC7\xE0\xEA\xEE\xED\xFB},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex18.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex18.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex18.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @INBOOK{Dolmatovskiy88,
-    author = "\xC4\xEE\xEB\xEC\xE0\xF2\xEE\xE2\xF1\xEA\xE8\xE9, \xDE. \xC0.",
-    title = "\xDD\xEB\xE5\xEA\xF2\xF0\xEE\xEC\xEE\xE1\xE8\xEB\xFC",
-    booktitle = "\xC1\xD1\xDD",
-    edition = "3-\xE5",
-    address   = "\xCC.",
-    year = 1988,
-    volume = 30,
-    pages = 72,
-    language = "russian"
+  author       = {\xC4\xEE\xEB\xEC\xE0\xF2\xEE\xE2\xF1\xEA\xE8\xE9, \xDE. \xC0.},
+  title        = {\xDD\xEB\xE5\xEA\xF2\xF0\xEE\xEC\xEE\xE1\xE8\xEB\xFC},
+  booktitle    = {\xC1\xD1\xDD},
+  edition      = {3-\xE5},
+  address      = {\xCC.},
+  year         = {1988},
+  volume       = {30},
+  pages        = {72},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex19.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex19.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex19.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,14 +1,14 @@
 @INPROCEEDINGS{Ponomarenko88,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC6\xF3\xF7\xEA\xEE\xE2\xE0, \xC8. \xC2.",
-    title = "\xCE\xEF\xF2\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xED\xE0\xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xEE\xE2 
-      \xEF\xF0\xE8 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8 \xE4\xEE\xF1\xF2\xF3\xEF\xE0 \xE2 \xEB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xF5 
-      \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xF1\xE5\xF2\xFF\xF5 \xC0\xD1\xD3\xD2\xCF",
-    booktitle = {\xD2\xF0\xF3\xE4\xFB \xCC\xE5\xE6\xE4\xF3\xED\xE0\xF0.\ \xEA\xEE\xED\xF4.\ 
-      <<\xCB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xE5 \xF1\xE5\xF2\xE8>> (\xCB\xCE\xCA\xD1\xC5\xD2\xDC 88)},
-    volume = 1,
-    address   = "\xD0\xE8\xE3\xE0",
-    publisher = "\xC8\xDD\xC2\xD2 \xC0\xCD \xCB\xE0\xF2\xE2\xE8\xE8",
-    year = 1988,
-    pages = "149-153",
-    language = "russian"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC6\xF3\xF7\xEA\xEE\xE2\xE0, \xC8. \xC2.},
+  title        = {\xCE\xEF\xF2\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xED\xE0\xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xEE\xE2
+                  \xEF\xF0\xE8 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8 \xE4\xEE\xF1\xF2\xF3\xEF\xE0 \xE2 \xEB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xF5
+                  \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xF1\xE5\xF2\xFF\xF5 \xC0\xD1\xD3\xD2\xCF},
+  booktitle    = {\xD2\xF0\xF3\xE4\xFB \xCC\xE5\xE6\xE4\xF3\xED\xE0\xF0.\ \xEA\xEE\xED\xF4.\
+                  <<\xCB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xE5 \xF1\xE5\xF2\xE8>> (\xCB\xCE\xCA\xD1\xC5\xD2\xDC 88)},
+  volume       = {1},
+  address      = {\xD0\xE8\xE3\xE0},
+  publisher    = {\xC8\xDD\xC2\xD2 \xC0\xCD \xCB\xE0\xF2\xE2\xE8\xE8},
+  year         = {1988},
+  pages        = {149-153},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex20.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex20.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex20.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,9 +1,9 @@
 @INPROCEEDINGS{Melikov95,
-    author = "Melikov, A. Z. and Ponomarenko, L. A.",
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+  author       = {Melikov, A. Z. and Ponomarenko, L. A.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex20a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex20a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex20a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,30 +1,28 @@
 @INPROCEEDINGS{Gojchuk98,
-    author="\xC3\xEE\xE9\xF7\xF3\xEA, \xC0. \xD4.",
-    title="\xCE\xF1\xEE\xE1\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE5\xF2\xB3\xEE\xEB\xEE㳿 \xB3 \xEF\xE0\xF2\xEE\xE3\xE5\xED\xE5\xE7\xF3 \xEF\xEE\xEF\xE5\xF0\xE5\xF7\xED\xEE\xE3\xEE \xF0\xE0\xEA\xF3 
-      \xE4\xF3\xE1\xE0 \xE7\xE2\xE8\xF7\xE0\xE9\xED\xEE\xE3\xEE \xE2 \xD3\xEA\xF0\xE0\xBF\xED\xB3",
-    booktitle="\xCD\xE0\xF3\xEA\xEE\xE2\xE8\xE9 \xE2\xB3\xF1\xED\xE8\xEA \xCD\xE0\xF6\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xE3\xEE 
-      \xE0\xE3\xF0\xE0\xF0\xED\xEE\xE3\xEE \xF3\xED\xB3\xE2\xE5\xF0\xF1\xE8\xF2\xE5\xF2\xF3",
-    editor="\xCC\xE5\xEB\xFC\xED\xE8\xF7\xF3\xEA\xE0, \xC4. \xCE. and others",
-    address="\xCA.",
-    publisher="\xCD\xC0\xD3",
-    year=1998,
-    series="\xC2\xE8\xEF. 8: ˳\xF1\xB3\xE2\xED\xE8\xF6\xF2\xE2\xEE",
-    pages="168--173",
-    language="ukrainian"
+  author       = {\xC3\xEE\xE9\xF7\xF3\xEA, \xC0. \xD4.},
+  title        = {\xCE\xF1\xEE\xE1\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE5\xF2\xB3\xEE\xEB\xEE㳿 \xB3 \xEF\xE0\xF2\xEE\xE3\xE5\xED\xE5\xE7\xF3 \xEF\xEE\xEF\xE5\xF0\xE5\xF7\xED\xEE\xE3\xEE \xF0\xE0\xEA\xF3
+                  \xE4\xF3\xE1\xE0 \xE7\xE2\xE8\xF7\xE0\xE9\xED\xEE\xE3\xEE \xE2 \xD3\xEA\xF0\xE0\xBF\xED\xB3},
+  booktitle    = {\xCD\xE0\xF3\xEA\xEE\xE2\xE8\xE9 \xE2\xB3\xF1\xED\xE8\xEA \xCD\xE0\xF6\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xE3\xEE
+                  \xE0\xE3\xF0\xE0\xF0\xED\xEE\xE3\xEE \xF3\xED\xB3\xE2\xE5\xF0\xF1\xE8\xF2\xE5\xF2\xF3},
+  editor       = {\xCC\xE5\xEB\xFC\xED\xE8\xF7\xF3\xEA\xE0, \xC4. \xCE. and others},
+  address      = {\xCA.},
+  publisher    = {\xCD\xC0\xD3},
+  year         = {1998},
+  series       = {\xC2\xE8\xEF. 8: ˳\xF1\xB3\xE2\xED\xE8\xF6\xF2\xE2\xEE},
+  pages        = {168--173},
+  language     = {ukrainian},
 }
 
 @INPROCEEDINGS{Polyakov98a,
-    author="\xCC. \xCE. \xCF\xEE\xEB\xFF\xEA\xEE\xE2",
-    title="\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE8\xE9 \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xF1\xB3\xEA \xE2 \xF3\xEF\xF0\xE0\xE2\xEB\xB3\xED\xED\xB3
-      \xEB\xB3\xF1\xEE\xE2\xE8\xEC\xE8 \xF0\xE5\xF1\xF3\xF0\xF1\xE0\xEC\xE8 \xED\xE0 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xEC\xF3 \xF0\xB3\xE2\xED\xB3",
-    crossref="Gojchuk98",
-    annote = "\xD0\xEE\xE7\xE3\xEB\xFF\xED\xF3\xF2\xEE \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE0\xF0\xED\xE8\xF5
-      \xE3\xEE\xF1\xEF\xEE\xE4\xE0\xF0\xF1\xFC\xEA\xE8\xF5 \xEE\xE4\xE8\xED\xE8\xF6\xFC \xED\xE0 \xF0\xEE\xE7\xEC\xB3\xF0 \xF0\xEE\xE7\xF0\xE0\xF5\xF3\xED\xEA\xEE\xE2\xEE\xBF \xEB\xB3\xF1\xEE\xF1\xB3\xEA\xE8.
-      \xC7\xE0\xEF\xF0\xEE\xEF\xEE\xED\xEE\xE2\xE0\xED\xEE \xEC\xE5\xF2\xEE\xE4 \xE2\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF \xEC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE \xE4\xEE\xEF\xF3\xF1\xF2\xE8\xEC\xEE\xE3\xEE \xF0\xEE\xE7\xEC\xB3\xF0\xF3
-      \xF0\xF3\xE1\xE0\xED\xED\xFF \xE7\xE0 \xEF\xEB\xEE\xF9\xE5\xFE \xED\xE0 \xF0\xB3\xE2\xED\xB3 \xF0\xE5\xE3\xB3\xEE\xED\xF3 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xB3 \xF1\xE8\xF1\xF2\xE5\xEC\xE8
-      \xE4\xE5\xF0\xE6\xE0\xE2\xED\xEE\xE3\xEE \xF0\xE5\xE3\xF3\xEB\xFE\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xED\xED\xFF \xE4\xEB\xFF \xF3\xEC\xEE\xE2 \xF0\xE8\xED\xEA\xEE\xE2\xEE\xBF
-      \xE5\xEA\xEE\xED\xEE\xEC\xB3\xEA\xE8",
-    pages="213--220"
+  author       = {\xCC. \xCE. \xCF\xEE\xEB\xFF\xEA\xEE\xE2},
+  title        = {\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE8\xE9 \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xF1\xB3\xEA \xE2 \xF3\xEF\xF0\xE0\xE2\xEB\xB3\xED\xED\xB3
+                  \xEB\xB3\xF1\xEE\xE2\xE8\xEC\xE8 \xF0\xE5\xF1\xF3\xF0\xF1\xE0\xEC\xE8 \xED\xE0 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xEC\xF3 \xF0\xB3\xE2\xED\xB3},
+  crossref     = {Gojchuk98},
+  annote       = {\xD0\xEE\xE7\xE3\xEB\xFF\xED\xF3\xF2\xEE \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE0\xF0\xED\xE8\xF5
+                  \xE3\xEE\xF1\xEF\xEE\xE4\xE0\xF0\xF1\xFC\xEA\xE8\xF5 \xEE\xE4\xE8\xED\xE8\xF6\xFC \xED\xE0 \xF0\xEE\xE7\xEC\xB3\xF0 \xF0\xEE\xE7\xF0\xE0\xF5\xF3\xED\xEA\xEE\xE2\xEE\xBF \xEB\xB3\xF1\xEE\xF1\xB3\xEA\xE8.
+                  \xC7\xE0\xEF\xF0\xEE\xEF\xEE\xED\xEE\xE2\xE0\xED\xEE \xEC\xE5\xF2\xEE\xE4 \xE2\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF \xEC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE \xE4\xEE\xEF\xF3\xF1\xF2\xE8\xEC\xEE\xE3\xEE \xF0\xEE\xE7\xEC\xB3\xF0\xF3
+                  \xF0\xF3\xE1\xE0\xED\xED\xFF \xE7\xE0 \xEF\xEB\xEE\xF9\xE5\xFE \xED\xE0 \xF0\xB3\xE2\xED\xB3 \xF0\xE5\xE3\xB3\xEE\xED\xF3 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xB3 \xF1\xE8\xF1\xF2\xE5\xEC\xE8
+                  \xE4\xE5\xF0\xE6\xE0\xE2\xED\xEE\xE3\xEE \xF0\xE5\xE3\xF3\xEB\xFE\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xED\xED\xFF \xE4\xEB\xFF \xF3\xEC\xEE\xE2 \xF0\xE8\xED\xEA\xEE\xE2\xEE\xBF
+                  \xE5\xEA\xEE\xED\xEE\xEC\xB3\xEA\xE8},
+  pages        = {213--220},
 }
-
- 
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex20b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex20b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex20b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,17 +1,16 @@
 @INPROCEEDINGS{TranskSpivrob99:Purich,
-    author = "\xCF\xF3\xF0\xE8\xF7, \xD8\xF2\xE5\xF4\xE0\xED",
-    title = "{\xD0}\xF3\xEC\xFB\xED\xF1\xEA\xEE-{\xD3}\xEA\xF0\xE0\xE8\xED\xF1\xEA\xEE\xE5 \xF2\xF0\xE0\xED\xF1\xE3\xF0\xE0\xED\xE8\xF7\xED\xEE\xE5 \xF1\xEE\xF2\xF0\xF3\xE4\xED\xE8\xF7\xE5\xF1\xF2\xE2\xEE: 
-      \xEF\xF0\xEE\xE1\xEB\xE5\xEC\xFB  \xE8 \xEF\xE5\xF0\xF1\xEF\xE5\xEA\xF2\xE8\xE2\xFB",
-    language = "russian",
-    booktitle = "\xD2\xF0\xE0\xED\xF1\xEA\xEE\xF0\xE4\xEE\xED\xED\xE5 \xF1\xEF\xB3\xE2\xF0\xEE\xE1\xB3\xF2\xED\xE8\xF6\xF2\xE2\xEE \xF3 \xEF\xEE\xEB\xB3\xE5\xF2\xED\xB3\xF7\xED\xE8\xF5 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xF5
-      {\xD1}\xF5\xB3\xE4\xED\xEE\xBF \xF2\xE0 {\xCF}\xB3\xE2\xE4\xE5\xED\xED\xEE-{\xD1}\xF5\xB3\xE4\xED\xEE\xBF {\xAA}\xE2\xF0\xEE\xEF\xE8: {\xCC}\xE0\xF2\xE5\xF0\xB3\xE0\xEB\xE8 \xED\xE0\xF3\xEA\xEE\xE2\xEE\xE3\xEE
-      \xF1\xE8\xEC\xEF\xEE\xE7\xB3\xF3\xEC\xF3",
-    editor = "\xCC\xE0\xEA\xE0\xF0\xE0, \xDE.",
-    address = "\xD7\xE5\xF0\xED\xB3\xE2\xF6\xB3",
-    publisher = "\xC7\xEE\xEB\xEE\xF2\xB3 \xEB\xE8\xF2\xE0\xE2\xF0\xE8",
-    organization = "\xC1\xF3\xEA\xEE\xE2\xE8\xED\xF1\xFC\xEA\xE8\xE9 \xEF\xEE\xEB\xB3\xF2\xEE\xEB\xEE\xE3\xB3\xF7\xED\xE8\xE9 \xF6\xE5\xED\xF2\xF0",
-    year = 1999,
-    pagetotal = 196,
-    booklanguage = "ukrainian"
+  author       = {\xCF\xF3\xF0\xE8\xF7, \xD8\xF2\xE5\xF4\xE0\xED},
+  title        = {{\xD0}\xF3\xEC\xFB\xED\xF1\xEA\xEE-{\xD3}\xEA\xF0\xE0\xE8\xED\xF1\xEA\xEE\xE5 \xF2\xF0\xE0\xED\xF1\xE3\xF0\xE0\xED\xE8\xF7\xED\xEE\xE5 \xF1\xEE\xF2\xF0\xF3\xE4\xED\xE8\xF7\xE5\xF1\xF2\xE2\xEE:
+                  \xEF\xF0\xEE\xE1\xEB\xE5\xEC\xFB  \xE8 \xEF\xE5\xF0\xF1\xEF\xE5\xEA\xF2\xE8\xE2\xFB},
+  language     = {russian},
+  booktitle    = {\xD2\xF0\xE0\xED\xF1\xEA\xEE\xF0\xE4\xEE\xED\xED\xE5 \xF1\xEF\xB3\xE2\xF0\xEE\xE1\xB3\xF2\xED\xE8\xF6\xF2\xE2\xEE \xF3 \xEF\xEE\xEB\xB3\xE5\xF2\xED\xB3\xF7\xED\xE8\xF5 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xF5
+                  {\xD1}\xF5\xB3\xE4\xED\xEE\xBF \xF2\xE0 {\xCF}\xB3\xE2\xE4\xE5\xED\xED\xEE-{\xD1}\xF5\xB3\xE4\xED\xEE\xBF {\xAA}\xE2\xF0\xEE\xEF\xE8: {\xCC}\xE0\xF2\xE5\xF0\xB3\xE0\xEB\xE8 \xED\xE0\xF3\xEA\xEE\xE2\xEE\xE3\xEE
+                  \xF1\xE8\xEC\xEF\xEE\xE7\xB3\xF3\xEC\xF3},
+  editor       = {\xCC\xE0\xEA\xE0\xF0\xE0, \xDE.},
+  address      = {\xD7\xE5\xF0\xED\xB3\xE2\xF6\xB3},
+  publisher    = {\xC7\xEE\xEB\xEE\xF2\xB3 \xEB\xE8\xF2\xE0\xE2\xF0\xE8},
+  organization = {\xC1\xF3\xEA\xEE\xE2\xE8\xED\xF1\xFC\xEA\xE8\xE9 \xEF\xEE\xEB\xB3\xF2\xEE\xEB\xEE\xE3\xB3\xF7\xED\xE8\xE9 \xF6\xE5\xED\xF2\xF0},
+  year         = {1999},
+  pagetotal    = {196},
+  booklanguage = {ukrainian},
 }
- 
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex20c.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex20c.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex20c.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,20 +1,20 @@
 @INPROCEEDINGS{Selikov95,
-    author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+  author       = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }
 
 @INPROCEEDINGS{Selikov+95,
-    author = {\xD1\xE5\xEB\xE8\xEA\xEE\xE2, A. Z. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xFC, L. A. and \xCA\xF0\xE0\xEC\xE0\xF0\xE5\xED\xEA\xEE, L. S. and \xC7\xEE\xEB\xEA\xE8\xED, \xCB. \xDE.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515",
-    language = "russian"
+  author       = {\xD1\xE5\xEB\xE8\xEA\xEE\xE2, A. Z. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xFC, L. A. and \xCA\xF0\xE0\xEC\xE0\xF0\xE5\xED\xEA\xEE, L. S. and \xC7\xEE\xEB\xEA\xE8\xED, \xCB. \xDE.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex21.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex21.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex21.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,14 +1,14 @@
 @PHDTHESIS{Luus82,
-  author = "\xCB\xF3\xF3\xF1, \xD0\xEE\xEC\xE0\xED  \xC0\xF0\xEA\xE0\xE4\xFC\xE5\xE2\xE8\xF7",
-  title = "\xC8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE5 \xEE\xE1\xEE\xF0\xF3\xE4\xEE\xE2\xE0\xED\xE8\xFF \xF1 \xEF\xED\xE5\xE2\xEC\xEE\xE2\xE0\xEA\xF3\xF3\xEC\xED\xFB\xEC 
-    \xEF\xF0\xE8\xE2\xEE\xE4\xEE\xEC \xE4\xEB\xFF \xE7\xE0\xF5\xE2\xE0\xF2\xE0, \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xE8\xFF \xE8 \xF4\xE8\xEA\xF1\xE0\xF6\xE8\xE8 
-    \xEF\xF0\xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE5 \xEF\xEE\xF0\xE8\xF1\xF2\xFB\xF5 \xE8 \xEB\xE5\xE3\xEA\xEE\xEF\xEE\xE2\xF0\xE5\xE6\xE4\xE0\xE5\xEC\xFB\xF5 
-    \xF1\xF2\xF0\xEE\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xE7\xE4\xE5\xEB\xE8\xE9",
-  type = "\xC4\xE8\xF1\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8 \xEA\xE0\xED\xE4\xE8\xE4\xE0\xF2\xE0 \xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xED\xE0\xF3\xEA",
-  number = "05.05.04",
-  school = "\xCC\xEE\xF1\xEA.\ \xF1\xF2\xF0\xEE\xE8\xF2.\ \xE8\xED-\xF2",
-  address   = "\xCC.",
-  year = 1982,
-  pagetotal = 212,
-  language = "russian"
+  author       = {\xCB\xF3\xF3\xF1, \xD0\xEE\xEC\xE0\xED  \xC0\xF0\xEA\xE0\xE4\xFC\xE5\xE2\xE8\xF7},
+  title        = {\xC8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE5 \xEE\xE1\xEE\xF0\xF3\xE4\xEE\xE2\xE0\xED\xE8\xFF \xF1 \xEF\xED\xE5\xE2\xEC\xEE\xE2\xE0\xEA\xF3\xF3\xEC\xED\xFB\xEC
+                  \xEF\xF0\xE8\xE2\xEE\xE4\xEE\xEC \xE4\xEB\xFF \xE7\xE0\xF5\xE2\xE0\xF2\xE0, \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xE8\xFF \xE8 \xF4\xE8\xEA\xF1\xE0\xF6\xE8\xE8
+                  \xEF\xF0\xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE5 \xEF\xEE\xF0\xE8\xF1\xF2\xFB\xF5 \xE8 \xEB\xE5\xE3\xEA\xEE\xEF\xEE\xE2\xF0\xE5\xE6\xE4\xE0\xE5\xEC\xFB\xF5
+                  \xF1\xF2\xF0\xEE\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xE7\xE4\xE5\xEB\xE8\xE9},
+  type         = {\xC4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8 \xEA\xE0\xED\xE4\xE8\xE4\xE0\xF2\xE0 \xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xED\xE0\xF3\xEA},
+  number       = {05.05.04},
+  institution  = {\xCC\xEE\xF1\xEA.\ \xF1\xF2\xF0\xEE\xE8\xF2.\ \xE8\xED-\xF2},
+  address      = {\xCC.},
+  year         = {1982},
+  pagetotal    = {212},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex21a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex21a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex21a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
- at DSciTHESIS{KIA95-default,
-  author = "\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8\xE3\xEE\xF0\xFC \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0\xEE\xE2\xE8\xF7",
-  title = "\xD2\xE5\xEE\xF0\xE8\xFF \xEC\xE0\xE3\xED\xE8\xF2\xED\xEE\xE3\xEE \xF3\xE4\xE5\xF0\xE6\xE0\xED\xE8\xFF \xE4\xE2\xF3\xF5\xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xED\xEE\xE9 \xEF\xEB\xE0\xE7\xEC\xFB 
-      \xE2 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEB\xEE\xE2\xF3\xF8\xEA\xE0\xF5",
-  number = "01.04.08",
-  school = "\xC8\xED-\xF2 \xFF\xE4\xE5\xF0\xED\xEE\xE9 \xF4\xE8\xE7\xE8\xEA\xE8 \xE8\xEC.\ \xC3.~\xC8. \xC1\xF3\xE4\xEA\xE5\xF0\xE0 \xD1\xCE \xD0\xC0\xCD",
-  address   = "\xCD\xEE\xE2\xEE\xF1\xE8\xE1\xE8\xF0\xF1\xEA",
-  year = 1995,
-  pagetotal = 350,
-  language = "russian"
+ at DOCTHESIS{KIA95-default,
+  author       = {\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8\xE3\xEE\xF0\xFC \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0\xEE\xE2\xE8\xF7},
+  title        = {\xD2\xE5\xEE\xF0\xE8\xFF \xEC\xE0\xE3\xED\xE8\xF2\xED\xEE\xE3\xEE \xF3\xE4\xE5\xF0\xE6\xE0\xED\xE8\xFF \xE4\xE2\xF3\xF5\xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xED\xEE\xE9 \xEF\xEB\xE0\xE7\xEC\xFB
+                  \xE2 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEB\xEE\xE2\xF3\xF8\xEA\xE0\xF5},
+  number       = {01.04.08},
+  institution  = {\xC8\xED-\xF2 \xFF\xE4\xE5\xF0\xED\xEE\xE9 \xF4\xE8\xE7\xE8\xEA\xE8 \xE8\xEC.\ \xC3.~\xC8. \xC1\xF3\xE4\xEA\xE5\xF0\xE0 \xD1\xCE \xD0\xC0\xCD},
+  address      = {\xCD\xEE\xE2\xEE\xF1\xE8\xE1\xE8\xF0\xF1\xEA},
+  year         = {1995},
+  pagetotal    = {350},
+  language     = {russian},
 }

Added: trunk/Master/texmf-dist/doc/bibtex/gost/ex21b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex21b.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex21b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,17 @@
+ at MASTERSTHESIS{mastersthesis-minimal,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  year         = {1988},
+  institution  = {Stanford University},
+}
+
+ at MASTERSTHESIS{mastersthesis-full,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  month        = jun,
+  note         = {This is a full MASTERSTHESIS entry},
+  type         = {Master's project},
+  year         = {1988},
+  address      = {English Department},
+  institution  = {Stanford University},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex22.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex22.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex22.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @THESIS{KIA85-autoref,
-  author = "\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8\xE3\xEE\xF0\xFC \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0\xEE\xE2\xE8\xF7",
-  title = "\xD2\xE5\xEE\xF0\xE8\xFF \xEC\xE0\xE3\xED\xE8\xF2\xED\xEE\xE3\xEE \xF3\xE4\xE5\xF0\xE6\xE0\xED\xE8\xFF \xE4\xE2\xF3\xF5\xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xED\xEE\xE9 \xEF\xEB\xE0\xE7\xEC\xFB 
-      \xE2 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEB\xEE\xE2\xF3\xF8\xEA\xE0\xF5",
-  type = "\xC0\xE2\xF2\xEE\xF0\xE5\xF4.\ \xE4\xE8\xF1.\ \xED\xE0 \xF1\xEE\xE8\xF1\xEA.\ \xF3\xF7\xE5\xED.\ \xF1\xF2\xE5\xEF.\ \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2.\ \xED\xE0\xF3\xEA",
-  number = "01.04.08",
-  school = "\xC8\xED-\xF2 \xFF\xE4\xE5\xF0\xED\xEE\xE9 \xF4\xE8\xE7\xE8\xEA\xE8 \xE8\xEC.\ \xC3.~\xC8. \xC1\xF3\xE4\xEA\xE5\xF0\xE0 \xD1\xCE \xD0\xC0\xCD",
-  address = "\xCD\xEE\xE2\xEE\xF1\xE8\xE1\xE8\xF0\xF1\xEA",
-  year = 1995,
-  pagetotal = 17,
-  language = "russian"
+  author       = {Котельников, Игорь Александрович},
+  title        = {Теория магнитного удержания двухкомпонентной плазмы
+                  в открытых ловушках},
+  type         = {Автореф.\ дис.\ на соиск.\ учен.\ степ.\ д-ра физ.-мат.\ наук},
+  number       = {01.04.08},
+  school       = {Ин-т ядерной физики им.\ Г.~И. Будкера СО РАН},
+  address      = {Новосибирск},
+  year         = {1995},
+  pagetotal    = {17},
+  language     = {russian},
 }

Added: trunk/Master/texmf-dist/doc/bibtex/gost/ex22a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex22a.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex22a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,46 @@
+ at THESIS{vishnyakov:thesis1,
+  title        = {Модели и методы оценки коммерческих банков в условиях неопределенности},
+  author       = {Вишняков, Илья Владимирович},
+  year         = {2002},
+  date         = {2002-02-04},
+  langid       = {russian},
+  language     = {russian},
+  location     = {М.},
+  speciality   = {экон. наук},
+  number       = {08.00.13},
+  pagetotal    = {234},
+  titleaddon   = {защищена 12.02.02~: утв. 24.06.02},
+}
+
+ at THESIS{vishnyakov:thesis2,
+  title        = {Модели и методы оценки коммерческих банков в условиях неопределенности},
+  author       = {Вишняков, Илья Владимирович},
+  type         = {phdthesis},
+  addendum     = {Библиогр.: с. 220---230.~--- 04200204433},
+  _year         = {2002},
+  date         = {2002-02-04},
+  langid       = {russian},
+  language     = {russian},
+  location     = {М.},
+  speciality     = {экон. наук},
+  specialitycode = {08.00.13},
+  media        = {text},
+  pagetotal    = {234},
+  titleaddon   = {защищена 12.02.02~: утв. 24.06.02},
+}
+
+
+ at THESIS{Skvortsov:2008,
+  title        = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+  author       = {Скворцов, Михаил Андреевич},
+  type         = {docthesis},
+  _year         = {2008},
+  institution  = {ИТФ им. Л.\,Д.~Ландау},
+  langid       = {russian},
+  language     = {russian},
+  location     = {Черноголовка},
+  speciality     = {физ.-мат. наук},
+  specialitycode = {01.04.02},
+  media        = {text},
+  pagetotal    = {224},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex23.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex23.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex23.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,11 +1,11 @@
 @BOOK{Ponomarenko76,
-  author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC1\xF3\xE0\xE4\xE7\xE5, \xC2. \xC2.",
-  title = "\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xE8 \xE0\xEB\xE3\xEE\xF0\xE8\xF2\xEC\xFB \xF1\xE1\xEE\xF0\xE0 
-    \xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xED\xE5\xEF\xF0\xE5\xF0\xFB\xE2\xED\xFB\xF5 
-    \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8",
-  address   = "\xCA.",
-  year = 1976,
-  pagetotal = 37,
-  language = "russian",
-  note = "(\xCF\xF0\xE5\xEF\xF0./ \xC0\xCD \xD3\xEA\xF0\xE0\xE8\xED\xFB. \xC8\xED-\xF2 \xEA\xE8\xE1\xE5\xF0\xED\xE5\xF2\xE8\xEA\xE8; 76-76)"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC1\xF3\xE0\xE4\xE7\xE5, \xC2. \xC2.},
+  title        = {\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xE8 \xE0\xEB\xE3\xEE\xF0\xE8\xF2\xEC\xFB \xF1\xE1\xEE\xF0\xE0
+                  \xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xED\xE5\xEF\xF0\xE5\xF0\xFB\xE2\xED\xFB\xF5
+                  \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8},
+  address      = {\xCA.},
+  year         = {1976},
+  pagetotal    = {37},
+  language     = {russian},
+  note         = {(\xCF\xF0\xE5\xEF\xF0./ \xC0\xCD \xD3\xEA\xF0\xE0\xE8\xED\xFB. \xC8\xED-\xF2 \xEA\xE8\xE1\xE5\xF0\xED\xE5\xF2\xE8\xEA\xE8; 76-76)},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex24.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex24.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex24.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,15 +1,15 @@
 @REPORT{Report81-rep,
-  title = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9 
-    \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7} 
-    \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
-  institution = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
-  address   = "\xCC.",
+  title        = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9
+                  \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7}
+                  \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
+  institution  = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
+  address      = {\xCC.},
   organization = {\xC2\xC8\xCD\xC8\xD2\xC8},
-  year = 1981,
-  pagetotal = 90,
-  type = "\xCE\xF2\xF7\xE5\xF2 \xEE {\xCD\xC8\xD0}",
-  editor = "\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.",
-  author = "\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others",
-  note = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  type         = {\xCE\xF2\xF7\xE5\xF2 \xEE {\xCD\xC8\xD0}},
+  editor       = {\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.},
+  author       = {\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others},
+  note         = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex24a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex24a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex24a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @REPORT{Report81b-rep-notype,
-  title = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9 
-    \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7} 
-    \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
-  institution = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
-  address   = "\xCC.",
+  title        = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9
+                  \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7}
+                  \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
+  institution  = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
+  address      = {\xCC.},
   organization = {\xC2\xC8\xCD\xC8\xD2\xC8},
-  year = 1981,
-  pagetotal = 90,
-  note = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  note         = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex24b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex24b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex24b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,14 +1,14 @@
 @TECHREPORT{Report81-techrep,
-  title = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9 
-    \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7} 
-    \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
-  institution = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
-  address   = "\xCC.",
+  title        = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9
+                  \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7}
+                  \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
+  institution  = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
+  address      = {\xCC.},
   organization = {\xC2\xC8\xCD\xC8\xD2\xC8},
-  year = 1981,
-  pagetotal = 90,
-  editor = "\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.",
-  author = "\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others",
-  note = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  editor       = {\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.},
+  author       = {\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others},
+  note         = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex25.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex25.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex25.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,11 @@
 @BOOK{CatalogMamals81,
-    title = {\xCA\xE0\xF2\xE0\xEB\xEE\xE3 \xEC\xEB\xE5\xEA\xEE\xEF\xE8\xF2\xE0\xFE\xF9\xE8\xF5 \xD1\xD1\xD1\xD0. 
-      \xCF\xEB\xE8\xEE\xF6\xE5\xED "--- \xF1\xEE\xE2\xF0\xE5\xEC\xE5\xED\xED\xEE\xF1\xF2\xFC},
-    organization = "\xC0\xCD \xD1\xD1\xD1\xD0, \xC7\xEE\xEE\xEB.\ \xE8\xED-\xF2",
-    editor = "\xC8. \xCC. \xC3\xF0\xEE\xEC\xEE\xE2\xE0 and \xC3. \xC8. \xC1\xE0\xF0\xE0\xED\xEE\xE2\xEE\xE9",
-    address   = "\xCB.",
-    publisher = "\xCD\xE0\xF3\xEA\xE0, \xCB\xE5\xED\xE8\xED\xE3.\ \xEE\xF2\xE4-\xED\xE8\xE5",
-    year = 1981,
-    pagetotal = 456,
-    language = "russian"
+  title        = {\xCA\xE0\xF2\xE0\xEB\xEE\xE3 \xEC\xEB\xE5\xEA\xEE\xEF\xE8\xF2\xE0\xFE\xF9\xE8\xF5 \xD1\xD1\xD1\xD0.
+                  \xCF\xEB\xE8\xEE\xF6\xE5\xED "--- \xF1\xEE\xE2\xF0\xE5\xEC\xE5\xED\xED\xEE\xF1\xF2\xFC},
+  organization = {\xC0\xCD \xD1\xD1\xD1\xD0, \xC7\xEE\xEE\xEB.\ \xE8\xED-\xF2},
+  editor       = {\xC8. \xCC. \xC3\xF0\xEE\xEC\xEE\xE2\xE0 and \xC3. \xC8. \xC1\xE0\xF0\xE0\xED\xEE\xE2\xEE\xE9},
+  address      = {\xCB.},
+  publisher    = {\xCD\xE0\xF3\xEA\xE0, \xCB\xE5\xED\xE8\xED\xE3.\ \xEE\xF2\xE4-\xED\xE8\xE5},
+  year         = {1981},
+  pagetotal    = {456},
+  language     = {russian},
 }
-

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex26.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex26.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex26.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @BOOK{Instr86,
-    title = "\xD2\xE8\xEF\xEE\xE2\xE0\xFF \xE8\xED\xF1\xF2\xF0\xF3\xEA\xF6\xE8\xFF \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8 
-      \xF2\xEE\xEF\xEB\xE8\xE2\xEE\xEE\xF2\xE4\xE0\xF7\xE8 \xF2\xE5\xEF\xEB\xEE\xE2\xFB\xF5 \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xF1\xF2\xE0\xED\xF6\xE8\xE9: 
-      \xD2\xC8 34-70-044-85: \xD3\xF2\xE2. \xC3\xEB. \xF2\xE5\xF5\xED. \xF3\xEF\xF0. 
-      \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8 \xFD\xED\xE5\xF0\xE3\xEE\xF1\xE8\xF1\xF2\xE5\xEC 01.10.85: 
-      \xD1\xF0\xEE\xEA \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED \xF1 01.01.86 \xE4\xEE 01.01.95",
-    organization = "\xCC-\xE2\xEE \xFD\xED\xE5\xF0\xE3\xE5\xF2\xE8\xEA\xE8 \xE8 \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8 \xD1\xD1\xD1\xD0",
-    address   = "\xCC.",
-    year = 1986,
-    pagetotal = 43,
-    language = "russian"
+  title        = {\xD2\xE8\xEF\xEE\xE2\xE0\xFF \xE8\xED\xF1\xF2\xF0\xF3\xEA\xF6\xE8\xFF \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8
+                  \xF2\xEE\xEF\xEB\xE8\xE2\xEE\xEE\xF2\xE4\xE0\xF7\xE8 \xF2\xE5\xEF\xEB\xEE\xE2\xFB\xF5 \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xF1\xF2\xE0\xED\xF6\xE8\xE9~:
+                  \xD2\xC8 34-70-044-85~: \xD3\xF2\xE2. \xC3\xEB. \xF2\xE5\xF5\xED. \xF3\xEF\xF0.
+                  \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8 \xFD\xED\xE5\xF0\xE3\xEE\xF1\xE8\xF1\xF2\xE5\xEC 01.10.85~:
+                  \xD1\xF0\xEE\xEA \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED \xF1 01.01.86 \xE4\xEE 01.01.95},
+  organization = {\xCC-\xE2\xEE \xFD\xED\xE5\xF0\xE3\xE5\xF2\xE8\xEA\xE8 \xE8 \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8 \xD1\xD1\xD1\xD0},
+  address      = {\xCC.},
+  year         = {1986},
+  pagetotal    = {43},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex27a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex27a.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex27a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,18 +1,18 @@
- at online{ wiki:latex,
-   author = "Wikipedia",
-   title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia",
-   year = "2012",
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia},
+  year         = {2012},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }
 
- at online{ wiki:latex-2,
-   author = "Wikipedia",
-   title = "{\LaTeX}",
-   howpublished = "Wikipedia, The Free Encyclopedia",
-   year = "2012",
-   eprint ="wiki/LaTeX",
-   eprinttype   = {WikiPedia},
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex-2,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}},
+  howpublished = {Wikipedia, The Free Encyclopedia},
+  year         = {2012},
+  eprint       = {wiki/LaTeX},
+  eprinttype   = {WikiPedia},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex27b.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex27b.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex27b.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,10 +1,10 @@
- at online{ phys:moodle,
-  author = {\xD7\xE5\xF0\xEA\xE0\xF1\xF1\xEA\xE8\xE9, \xC2. \xD1.},
-  title = {\xCA\xEB\xE0\xF1\xF1\xED\xE0\xFF \xEA\xEE\xEC\xED\xE0\xF2\xE0},
-  howpublished = "\xD4\xE8\xE7\xE8\xF7\xE5\xF1\xEA\xE8\xE9 \xF4\xE0\xEA\xF3\xEB\xFC\xF2\xE5\xF2",
-  organization = "\xCD\xC3\xD3",
-  year = 2012,
-  url = {http://www.phys.nsu.ru/moodle/},
-  urldate = "16.01.2012",
-  language = "russian"
+ at ONLINE{phys:moodle,
+  author       = {\xD7\xE5\xF0\xEA\xE0\xF1\xF1\xEA\xE8\xE9, \xC2. \xD1.},
+  title        = {\xCA\xEB\xE0\xF1\xF1\xED\xE0\xFF \xEA\xEE\xEC\xED\xE0\xF2\xE0},
+  howpublished = {\xD4\xE8\xE7\xE8\xF7\xE5\xF1\xEA\xE8\xE9 \xF4\xE0\xEA\xF3\xEB\xFC\xF2\xE5\xF2},
+  organization = {\xCD\xC3\xD3},
+  year         = {2012},
+  url          = {http://www.phys.nsu.ru/moodle/},
+  urldate      = {16.01.2012},
+  language     = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex27c.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex27c.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex27c.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -4,5 +4,5 @@
   url          = {http://www-nds.iaea.org/exfor},
   address      = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria},
   year         = {2012},
-  medium       = {Electronic resource}
+  media        = {eresource}
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex28.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex28.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex28.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,12 +1,12 @@
 @BOOK{IsaacNewton,
   author       = {Newton, {\relax Sir Isaac}},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   publisher    = {William Innys},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {eresource},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
@@ -13,13 +13,13 @@
 
 @BOOK{IsaacNewton-sl:sn,
   author       = {{\relax Sir I}saac Newton},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {online},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
-%  publisher    = {William Innys},
+%  publisher   = {William Innys},

Added: trunk/Master/texmf-dist/doc/bibtex/gost/ex28a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex28a.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex28a.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,32 @@
+ at BOOK{Encyclopedia,
+  title        = {\xD5\xF3\xE4\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xE0\xFF \xFD\xED\xF6\xE8\xEA\xEB\xEE\xEF\xE5\xE4\xE8\xFF \xE7\xE0\xF0\xF3\xE1\xE5\xE6\xED\xEE\xE3\xEE \xEA\xEB\xE0\xF1\xF1\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xE8\xF1\xEA\xF3\xF1\xF1\xF2\xE2\xE0},
+  publisher    = {\xC1\xEE\xEB\xFC\xF8\xE0\xFF \xD0\xEE\xF1. \xFD\xED\xF6\xE8\xEA\xEB.},
+  year         = {1996},
+  address      = {\xCC.},
+  note         = {1 \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xED. \xEE\xEF\xF2. \xE4\xE8\xF1\xEA (CD-ROM)},
+  language     = {russian},
+  media        = {eresource},
+}
+
+ at ARTICLE{Nasirova,
+  title        = {\xCC\xEE\xE4\xE5\xEB\xE8 \xE3\xEE\xF1\xF3\xE4\xE0\xF0\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF0\xE5\xE3\xF3\xEB\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xF1\xF2\xF0\xE0\xF5\xEE\xE2\xEE\xE9 \xE4\xE5\xFF\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xE8},
+  author       = {\xCD\xE0\xF1\xFB\xF0\xEE\xE2\xE0, \xC3. \xC0.},
+  language     = {russian},
+  note         = {\xD0\xE5\xE6\xE8\xEC \xE4\xEE\xF1\xF2\xF3\xEF\xE0: http://vestnik.fa.ru/4(28)2003/4.html},
+  number       = {4},
+  year         = {2003},
+  journal      = {\xC2\xE5\xF1\xF2\xED\xE8\xEA \xD4\xE8\xED\xE0\xED\xF1\xEE\xE2\xEE\xE9 \xE0\xEA\xE0\xE4\xE5\xEC\xE8\xE8},
+  media2       = {eresource},
+  media        = {online},
+}
+
+ at BOOK{kremlincd,
+  title        = {\xCC\xEE\xF1\xEA\xEE\xE2\xF1\xEA\xE8\xE9 \xCA\xF0\xE5\xEC\xEB\xFC},
+  titleaddon   = {\xF2\xF0\xE5\xF5\xEC\xE5\xF0. \xEF\xF3\xF2\xE5\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC},
+  language     = {russian},
+  note         = {CD-ROM},
+  date         = {2007},
+  location     = {\xCC.},
+  publisher    = {\xCD\xEE\xE2\xFB\xE9 \xC4\xE8\xF1\xEA},
+  media        = {eresource},
+}

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex29.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex29.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex29.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,15 +1,15 @@
- at article{PhysRevLett.101.085006,
-  author = {Kotelnikov, Igor and Rom\'e, Massimiliano},
-  volume = {101},
-  journal = {Phys. Rev. Lett.},
-  month = {Aug},
-  pagetotal = {4},
-  title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
-  year = {2008},
-  doi = {10.1103/PhysRevLett.101.085006},
-  issue = {8},
-  publisher = {American Physical Society},
-  pages = {085006}
+ at ARTICLE{PhysRevLett.101.085006,
+  author       = {Kotelnikov, Igor and Rom\'e, Massimiliano},
+  volume       = {101},
+  journal      = {Phys. Rev. Lett.},
+  month        = {Aug},
+  pagetotal    = {4},
+  title        = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
+  year         = {2008},
+  doi          = {10.1103/PhysRevLett.101.085006},
+  issue        = {8},
+  publisher    = {American Physical Society},
+  pages        = {085006},
 }
 
 % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006},

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex30.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex30.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex30.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,27 +1,27 @@
 @ARTICLE{1998PhRvE..57.7111K,
-   author = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
-    title = "{Turbulent cascades in anisotropic magnetohydrodynamics}",
-  journal = pre,
- keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
-     year = 1998,
-    month = jun,
-   volume = 57,
-    pages = {7111-7121},
-      doi = {10.1103/PhysRevE.57.7111},
-   adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
-  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+  author       = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
+  title        = {{Turbulent cascades in anisotropic magnetohydrodynamics}},
+  journal      = pre,
+  keywords     = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
+  year         = {1998},
+  month        = jun,
+  volume       = {57},
+  pages        = {7111-7121},
+  doi          = {10.1103/PhysRevE.57.7111},
+  adsurl       = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
+  adsnote      = {Provided by the SAO/NASA Astrophysics Data System},
 }
 
 @ARTICLE{1998UFN,
-   author = {\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8. \xC0. and \xC0\xF1\xF2\xF0\xE5\xEB\xE8\xED, \xC2. \xD2.},
-    title = "\xD2\xE5\xEE\xF0\xE8\xFF \xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xEE\xE3\xEE \xFD\xEC\xE8\xF2\xF2\xE5\xF0\xE0 \xEF\xEE\xEB\xEE\xE6\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xEE\xED\xEE\xE2",
-  journal = ufn,
- keywords = {\xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xFB\xE9 \xFD\xEC\xE8\xF2\xF2\xE5\xF0, \xEA\xF0\xE8\xF2\xE5\xF0\xE8\xE9 \xC1\xEE\xEC\xE0},
-     year = 2015,
-    month = jul,
-   volume = 185,
-    pages = {753-771},
- language = {russian},
-      doi = {10.3367/UFNr.0185.201507c.0753},
-      url = {http://ufn.ru/ru/articles/2015/7/c/},
+  author       = {\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8. \xC0. and \xC0\xF1\xF2\xF0\xE5\xEB\xE8\xED, \xC2. \xD2.},
+  title        = {\xD2\xE5\xEE\xF0\xE8\xFF \xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xEE\xE3\xEE \xFD\xEC\xE8\xF2\xF2\xE5\xF0\xE0 \xEF\xEE\xEB\xEE\xE6\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xEE\xED\xEE\xE2},
+  journal      = ufn,
+  keywords     = {\xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xFB\xE9 \xFD\xEC\xE8\xF2\xF2\xE5\xF0, \xEA\xF0\xE8\xF2\xE5\xF0\xE8\xE9 \xC1\xEE\xEC\xE0},
+  year         = {2015},
+  month        = jul,
+  volume       = {185},
+  pages        = {753-771},
+  language     = {russian},
+  doi          = {10.3367/UFNr.0185.201507c.0753},
+  url          = {http://ufn.ru/ru/articles/2015/7/c/},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ex31.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ex31.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ex31.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,40 +1,40 @@
 @PATENT{patent1,
-  	author          = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+  	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.},
+  	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       = {text},
+  	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},
+  	requestdate = {07.04.2000},
   	publicationdate = {10.03.2001},
-  	publication     = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
-  	prioritydate    = {09.04.1999},
+  	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},
+  pagetotal    = {5 \xF1.~: \xE8\xEB.},
+  	language    = {russian},
 }
 
 @PATENT{patent2,
-  	author          = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+  	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.},
+  	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       = {text},
+  	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},
+  	date        = {18.12.2000},
   	publicationdate = {20.08.2002},
-  	publication     = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
-    pagetotal       = {2 \xF1.~: \xE8\xEB.},
-  	language        = {russian},
+  	publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+  pagetotal    = {2 \xF1.~: \xE8\xEB.},
+  	language    = {russian},
 }

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/examples.bib	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,451 +1,461 @@
 @BOOK{Vasylenko92,
-    author = "\xC2\xE0\xF1\xE8\xEB\xE5\xED\xEA\xEE, \xCC. \xC2.",
-    title = "\xD2\xE5\xEE\xF0\xB3\xFF \xEA\xEE\xEB\xE8\xE2\xE0\xED\xFC: \xCD\xE0\xE2\xF7\xE0\xEB\xFC\xED\xE8\xE9 \xEF\xEE\xF1\xB3\xE1\xED\xE8\xEA",
-    address = "\xCA.",
-    publisher = "\xC2\xE8\xF9\xE0 \xF8\xEA\xEE\xEB\xE0",
-    year = 1992,
-    pagetotal = 430,
-    language = "ukrainian"
+  author       = {\xC2\xE0\xF1\xE8\xEB\xE5\xED\xEA\xEE, \xCC. \xC2.},
+  title        = {\xD2\xE5\xEE\xF0\xB3\xFF \xEA\xEE\xEB\xE8\xE2\xE0\xED\xFC: \xCD\xE0\xE2\xF7\xE0\xEB\xFC\xED\xE8\xE9 \xEF\xEE\xF1\xB3\xE1\xED\xE8\xEA},
+  address      = {\xCA.},
+  publisher    = {\xC2\xE8\xF9\xE0 \xF8\xEA\xEE\xEB\xE0},
+  year         = {1992},
+  pagetotal    = {430},
+  language     = {ukrainian},
 }
 @BOOK{Afanasyev92,
-    author = "\xC0\xF4\xE0\xED\xE0\xF1\xFC\xE5\xE2, \xC2. \xC2. and \xC2\xE0\xF1\xE8\xEB\xE5\xE2\xF1\xEA\xE8\xE9, \xCE. \xCD.",
-    title = "\xD0\xE0\xF1\xF7\xE5\xF2\xFB \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF6\xE5\xEF\xE5\xE9 
-      \xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xEC\xE8\xEA\xF0\xEE\xEA\xE0\xEB\xFC\xEA\xF3\xEB\xFF\xF2\xEE\xF0\xE0\xF5",
-    address = "\xCC.",
-    publisher = "\xDD\xED\xE5\xF0\xE3\xEE\xE8\xE7\xE4\xE0\xF2",
-    year = 1992,
-    pagetotal = 190,
-    language = "russian"
+  author       = {\xC0\xF4\xE0\xED\xE0\xF1\xFC\xE5\xE2, \xC2. \xC2. and \xC2\xE0\xF1\xE8\xEB\xE5\xE2\xF1\xEA\xE8\xE9, \xCE. \xCD.},
+  title        = {\xD0\xE0\xF1\xF7\xE5\xF2\xFB \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF6\xE5\xEF\xE5\xE9
+                  \xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xEC\xE8\xEA\xF0\xEE\xEA\xE0\xEB\xFC\xEA\xF3\xEB\xFF\xF2\xEE\xF0\xE0\xF5},
+  address      = {\xCC.},
+  publisher    = {\xDD\xED\xE5\xF0\xE3\xEE\xE8\xE7\xE4\xE0\xF2},
+  year         = {1992},
+  pagetotal    = {190},
+  language     = {russian},
 }
 @BOOK{Makilov91,
-    author = "\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. 
-      and \xD0\xFE\xEC\xF8\xE8\xED, \xCF. \xC0.",
-    title = "\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xEC\xED\xEE\xE3\xEE\xEF\xEE\xF2\xEE\xEA\xEE\xE2\xFB\xF5 
-      \xF1\xE8\xF1\xF2\xE5\xEC \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF",
-    address = "\xCA.",
-    publisher = "\xD2\xE5\xF5\xED\xB3\xEA\xE0",
-    year = 1991,
-    pagetotal = 265,
-    language = "russian"
+  author       = {\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.
+                  and \xD0\xFE\xEC\xF8\xE8\xED, \xCF. \xC0.},
+  title        = {\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xEC\xED\xEE\xE3\xEE\xEF\xEE\xF2\xEE\xEA\xEE\xE2\xFB\xF5
+                  \xF1\xE8\xF1\xF2\xE5\xEC \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF},
+  address      = {\xCA.},
+  publisher    = {\xD2\xE5\xF5\xED\xB3\xEA\xE0},
+  year         = {1991},
+  pagetotal    = {265},
+  language     = {russian},
 }
 @BOOK{Ponomarenko86,
-  title = "\xCE\xF1\xED\xEE\xE2\xFB \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xE1\xEA\xE8\xF5 \xE0\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2",
-  author = "\xCB. \xC0. \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE and \xCB. \xC2. \xC0\xE4\xE0\xEC\xEE\xE2\xE8\xF7 
-    and \xC2. \xD2. \xCC\xF3\xE7\xFB\xF7\xF3\xEA and  \xC0. \xC5. \xC3\xF0\xE8\xE4\xE0\xF1\xEE\xE2",
-  editor = "\xC1. \xC1. \xD2\xE8\xEC\xEE\xF4\xE5\xE5\xE2\xE0",
-  address   = "\xCA.",
-  publisher = "\xD2\xE5\xF5\xED\xB3\xEA\xE0",
-  year = 1986,
-  pagetotal = 144,
-  language = "russian"
+  title        = {\xCE\xF1\xED\xEE\xE2\xFB \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xE1\xEA\xE8\xF5 \xE0\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2},
+  author       = {\xCB. \xC0. \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE and \xCB. \xC2. \xC0\xE4\xE0\xEC\xEE\xE2\xE8\xF7
+                  and \xC2. \xD2. \xCC\xF3\xE7\xFB\xF7\xF3\xEA and  \xC0. \xC5. \xC3\xF0\xE8\xE4\xE0\xF1\xEE\xE2},
+  editor       = {\xC1. \xC1. \xD2\xE8\xEC\xEE\xF4\xE5\xE5\xE2\xE0},
+  address      = {\xCA.},
+  publisher    = {\xD2\xE5\xF5\xED\xB3\xEA\xE0},
+  year         = {1986},
+  pagetotal    = {144},
+  language     = {russian},
 }
 @BOOK{Belousova81,
-  title = "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xFB\xE9 \xE0\xED\xE0\xEB\xE8\xE7 \xE8\xED\xF4\xF0\xE0\xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xFB 
-    \xEA\xE0\xEA \xFD\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE0\xF0\xEE\xE4\xED\xEE\xE3\xEE \xF5\xEE\xE7\xFF\xE9\xF1\xF2\xE2\xE0",
-  author = "\xC1\xE5\xEB\xEE\xF3\xF1\xEE\xE2\xE0, \xCD. \xC8. and \xC2\xE8\xF8\xED\xFF\xEA, \xC5. \xC8. 
-    and \xCB\xE5\xE2\xE8\xF2, \xC2. \xDE. and others",
-  address   = "\xCC.",
-  publisher = "\xDD\xEA\xEE\xED\xEE\xEC\xE8\xEA\xE0",
-  year = 1981,
-  pagetotal = 62,
-  language = "russian"
-}@BOOK{BibOp91,
-    title = "\xD1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xEE\xEF\xE8\xF1\xE0\xED\xE8\xFF: 
-      \xCA\xF0\xE0\xF2\xEA\xE8\xE5 \xEF\xF0\xE0\xE2\xE8\xEB\xE0",
-    organization = "\xCC\xE5\xE6\xE4\xF3\xE2\xE5\xE4. \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE8\xE7\xE0\xF6. \xEA\xEE\xEC\xE8\xF1. 
-      \xEF\xF0\xE8 \xC3\xEE\xF1. \xE1-\xEA\xE5 \xD1\xD1\xD1\xD0 \xE8\xEC.~\xC2.~\xC8. \xCB\xE5\xED\xE8\xED\xE0",
-    edition = "2-\xE5, \xE4\xEE\xEF.",
-    address   = "\xCC.",
-    publisher = "\xCA\xED.~\xEF\xE0\xEB\xE0\xF2\xE0",
-    year = 1991,
-    pagetotal = 224,
-    language = "russian"
+  title        = {\xD1\xE8\xF1\xF2\xE5\xEC\xED\xFB\xE9 \xE0\xED\xE0\xEB\xE8\xE7 \xE8\xED\xF4\xF0\xE0\xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xFB
+                  \xEA\xE0\xEA \xFD\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE0\xF0\xEE\xE4\xED\xEE\xE3\xEE \xF5\xEE\xE7\xFF\xE9\xF1\xF2\xE2\xE0},
+  author       = {\xC1\xE5\xEB\xEE\xF3\xF1\xEE\xE2\xE0, \xCD. \xC8. and \xC2\xE8\xF8\xED\xFF\xEA, \xC5. \xC8.
+                  and \xCB\xE5\xE2\xE8\xF2, \xC2. \xDE. and others},
+  address      = {\xCC.},
+  publisher    = {\xDD\xEA\xEE\xED\xEE\xEC\xE8\xEA\xE0},
+  year         = {1981},
+  pagetotal    = {62},
+  language     = {russian},
 }
+ at BOOK{BibOp91,
+  title        = {\xD1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xEE\xEF\xE8\xF1\xE0\xED\xE8\xFF:
+                  \xCA\xF0\xE0\xF2\xEA\xE8\xE5 \xEF\xF0\xE0\xE2\xE8\xEB\xE0},
+  organization = {\xCC\xE5\xE6\xE4\xF3\xE2\xE5\xE4. \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE8\xE7\xE0\xF6. \xEA\xEE\xEC\xE8\xF1.
+                  \xEF\xF0\xE8 \xC3\xEE\xF1. \xE1-\xEA\xE5 \xD1\xD1\xD1\xD0 \xE8\xEC.~\xC2.~\xC8. \xCB\xE5\xED\xE8\xED\xE0},
+  edition      = {2-\xE5, \xE4\xEE\xEF.},
+  address      = {\xCC.},
+  publisher    = {\xCA\xED.~\xEF\xE0\xEB\xE0\xF2\xE0},
+  year         = {1991},
+  pagetotal    = {224},
+  language     = {russian},
+}
 @BOOK{Poems82,
-    title = "\xD1\xF2\xE8\xF5\xE8 \xEE \xEC\xF3\xE7\xFB\xEA\xE5. \xD0\xF3\xF1\xF1\xEA\xE8\xE5, 
-      \xF1\xEE\xE2\xE5\xF2\xF1\xEA\xE8\xE5, \xE7\xE0\xF0\xF3\xE1\xE5\xE6\xED\xFB\xE5 \xEF\xEE\xFD\xF2\xFB: \xD1\xE1\xEE\xF0\xED\xE8\xEA",
-    compiler = "\xC0. \xC1\xE8\xF0\xFE\xEA\xEE\xE2\xE0 and \xC2. \xD2\xE0\xF2\xE0\xF0\xE8\xED\xEE\xE2",
-    address   = "\xCC.",
-    publisher = "\xD1\xEE\xE2. \xEA\xEE\xEC\xEF\xEE\xE7\xE8\xF2\xEE\xF0",
-    year = 1982,
-    pagetotal = 224,
-    language = "russian"
+  title        = {\xD1\xF2\xE8\xF5\xE8 \xEE \xEC\xF3\xE7\xFB\xEA\xE5. \xD0\xF3\xF1\xF1\xEA\xE8\xE5,
+                  \xF1\xEE\xE2\xE5\xF2\xF1\xEA\xE8\xE5, \xE7\xE0\xF0\xF3\xE1\xE5\xE6\xED\xFB\xE5 \xEF\xEE\xFD\xF2\xFB: \xD1\xE1\xEE\xF0\xED\xE8\xEA},
+  compiler     = {\xC0. \xC1\xE8\xF0\xFE\xEA\xEE\xE2\xE0 and \xC2. \xD2\xE0\xF2\xE0\xF0\xE8\xED\xEE\xE2},
+  address      = {\xCC.},
+  publisher    = {\xD1\xEE\xE2. \xEA\xEE\xEC\xEF\xEE\xE7\xE8\xF2\xEE\xF0},
+  year         = {1982},
+  pagetotal    = {224},
+  language     = {russian},
 }
 @BOOK{HistLit82,
-    title = "\xC8\xF1\xF2\xEE\xF0\xE8\xFF \xF0\xF3\xF1\xF1\xEA\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB: \xC2 4 \xF2.",
-    organization = "\xC0\xCD \xD1\xD1\xD1\xD0, \xC8\xED-\xF2 \xF0\xF3\xF1.~\xEB\xE8\xF2.\ (\xCF\xF3\xF8\xEA\xE8\xED.\xE4\xEE\xEC)",
-    address   = "\xCC.",
-    year = 1982,
-    Volume = "3: \xD0\xE0\xF1\xF6\xE2\xE5\xF2 \xF0\xE5\xE0\xEB\xE8\xE7\xEC\xE0",
-    pagetotal = 876,
-    language = "russian"
-}@Book{Landau:eldin,
-    author  = "\xCB. \xC4. \xCB\xE0\xED\xE4\xE0\xF3 and \xC5. \xCC. \xCB\xE8\xF4\xF8\xE8\xF6",
-    title   = "\xD2\xE5\xEE\xF0\xE5\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF4\xE8\xE7\xE8\xEA\xE0: \xF3\xF7\xE5\xE1\xED\xEE\xE5 \xEF\xEE\xF1\xEE\xE1\xE8\xE5 \xE2 10 \xF2.",
-    publisher       = "\xCD\xE0\xF3\xEA\xE0. \xC3\xEB.\ \xF0\xE5\xE4.\ \xF4\xE8\xE7.-\xEC\xE0\xF2.\ \xEB\xE8\xF2.",
-    address = "\xCC.",
-    year    = 1992,
-    volume  = "VIII. \xDD\xEB\xE5\xEA\xF2\xF0\xEE\xE4\xE8\xED\xE0\xEC\xE8\xEA\xE0 \xF1\xEF\xEB\xEE\xF8\xED\xFB\xF5 \xF1\xF0\xE5\xE4",
-    edition = "3-\xE5, \xE8\xF1\xEF\xF0.",
-    language = "russian"
+  title        = {\xC8\xF1\xF2\xEE\xF0\xE8\xFF \xF0\xF3\xF1\xF1\xEA\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB: \xC2 4 \xF2.},
+  organization = {\xC0\xCD \xD1\xD1\xD1\xD0, \xC8\xED-\xF2 \xF0\xF3\xF1.~\xEB\xE8\xF2.\ (\xCF\xF3\xF8\xEA\xE8\xED.\xE4\xEE\xEC)},
+  address      = {\xCC.},
+  year         = {1982},
+  volume       = {3: \xD0\xE0\xF1\xF6\xE2\xE5\xF2 \xF0\xE5\xE0\xEB\xE8\xE7\xEC\xE0},
+  pagetotal    = {876},
+  language     = {russian},
 }
- at Book{BRLS94,
-  title      = "\xCD\xE0\xF0\xFB\xF1\xFB \xEF\xE0 \xE3i\xF1\xF2\xEE\xF0\xFBi \xE1\xE5\xEB\xE0\xF0\xF3\xF1\xEA\xE0-\xF0\xF3\xF1\xEAi\xF5 
-    \xEBi\xF2\xE0\xF0\xE0\xF2\xF3\xF0\xED\xFB\xF5 \xF1\xF3\xE2\xFF\xE7\xE5\xE9: \xD3 4 \xEA\xED.",
-  organization = "\xC0\xEA\xE0\xE4.\ \xED\xE0\xE2\xF3\xEA \xC1\xE5\xEB\xE0\xF0\xF3\xF1i. I\xED-\xF2 \xEBi\xF2.",
-  address = "\xCCi\xED\xF1\xEA",
-  publisher = "\xCD\xE0\xE2\xF3\xEA\xE0 i \xF2\xFD\xF5\xEDi\xEA\xE0",
-  year = "1994",
-  volume = "2: \xCF\xE0\xF7\xE0\xF2\xE0\xEA \xD5\xD5 \xF1\xF2. 1900--1917 \xE3\xE3.",
-  editor = "\xC2. \xC0. \xCA\xE0\xE2\xE0\xEB\xE5\xED\xEA\xE0 and I. \xDF. \xCD\xE0\xE2\xF3\xEC\xE5\xED\xEA\xE0",
-  pagetotal = 440,
-  language = "russian"
-}@BOOK{Grosse80,
-    author = "\xC3\xF0\xEE\xF1\xF1\xE5, \xDD. and \xC2\xE0\xE9\xF1\xEC\xE0\xED\xE3\xE5\xEB\xFC, \xD5.",
-    title = "\xD5\xE8\xEC\xE8\xFF \xE4\xEB\xFF \xEB\xFE\xE1\xEE\xE7\xED\xE0\xF2\xE5\xEB\xFC\xED\xFB\xF5: \xCF\xE5\xF0.\ \xF1 \xED\xE5\xEC.",
-    address   = "\xCC.",
-    publisher = "\xD5\xE8\xEC\xE8\xFF",
-    year = 1980,
-    pagetotal = 392,
-    language = "russian"
-}@BOOK{GOST7184,
-    key = {\xC3\xCE\xD1\xD2},
-    title = "\xC3\xCE\xD1\xD2 7.1.-84. \xC1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE5 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0. 
-      \xCE\xE1\xF9\xE8\xE5 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xF1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xFF. 
-      --- \xC2\xE7\xE0\xEC\xE5\xED \xC3\xCE\xD1\xD2 7.1.-76; \xC2\xE2\xE5\xE4. 01.01.86.",
-    address   = "\xCC.",
-    publisher = "\xC8\xE7\xE4-\xE2\xEE \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xEE\xE2",
-    year = 1984,
-    pagetotal = 78,
-    language = "russian"
-}@BOOK{ObchTech93,
-    title = "\xCE\xE1\xF7\xE8\xF1\xEB\xFE\xE2\xE0\xEB\xFC\xED\xE0 \xB3 \xEF\xF0\xE8\xEA\xEB\xE0\xE4\xED\xE0 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xEA\xE0: \xC7\xE1.\xED\xE0\xF3\xEA.\xEF\xF0.",
-    address   = "\xCA.",
-    publisher = "\xCB\xE8\xE1\xB3\xE4\xFC",
-    year = 1993,
-    pagetotal = 99,
-    language = "ukrainian"
-}@BOOK{Bibdelo86,
-    title = "\xC1\xE8\xE1\xEB\xE8\xEE\xF2\xE5\xF7\xED\xEE\xE5 \xE4\xE5\xEB\xEE: \xD2\xE5\xF0\xEC\xE8\xED\xEE\xEB. \xF1\xEB\xEE\xE2\xE0\xF0\xFC",
-    composer = "\xC8. \xCC. \xD1\xF3\xF1\xEB\xEE\xE2\xE0  and \xCB. \xCD. \xD3\xEB\xE0\xED\xEE\xE2\xE0",
-    edition = "2-\xE5 \xE8\xE7\xE4.",
-    address   = "\xCC.",
-    publisher = "\xCA\xED\xE8\xE3\xE0",
-    year = 1986,
-    pagetotal = 224,
-    language = "russian"
-}@INBOOK{Ponomarenko79,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.",
-    title = "\xCE\xF0\xE3\xE0\xED\xE8\xE7\xF3\xFE\xF9\xE0\xFF \xF1\xE8\xF1\xF2\xE5\xEC\xE0",
-    booktitle = "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xFF \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xEE\xE2 
-      \xE2 \xEF\xF0\xEE\xEA\xE0\xF2\xED\xEE\xEC \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2\xE5",
-    address   = "\xCC.",
-    publisher = "\xCC\xE5\xF2\xE0\xEB\xEB\xF3\xF0\xE3\xE8\xFF",
-    year = 1979,
-    pages = "141-148",
-    language = "russian"
+ at BOOK{Landau:eldin,
+  author       = {\xCB. \xC4. \xCB\xE0\xED\xE4\xE0\xF3 and \xC5. \xCC. \xCB\xE8\xF4\xF8\xE8\xF6},
+  title        = {\xD2\xE5\xEE\xF0\xE5\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF4\xE8\xE7\xE8\xEA\xE0: \xF3\xF7\xE5\xE1\xED\xEE\xE5 \xEF\xEE\xF1\xEE\xE1\xE8\xE5 \xE2 10 \xF2.},
+  publisher    = {\xCD\xE0\xF3\xEA\xE0. \xC3\xEB.\ \xF0\xE5\xE4.\ \xF4\xE8\xE7.-\xEC\xE0\xF2.\ \xEB\xE8\xF2.},
+  address      = {\xCC.},
+  year         = {1992},
+  volume       = {VIII. \xDD\xEB\xE5\xEA\xF2\xF0\xEE\xE4\xE8\xED\xE0\xEC\xE8\xEA\xE0 \xF1\xEF\xEB\xEE\xF8\xED\xFB\xF5 \xF1\xF0\xE5\xE4},
+  edition      = {3-\xE5, \xE8\xF1\xEF\xF0.},
+  language     = {russian},
 }
+ at BOOK{BRLS94,
+  title        = {\xCD\xE0\xF0\xFB\xF1\xFB \xEF\xE0 \xE3i\xF1\xF2\xEE\xF0\xFBi \xE1\xE5\xEB\xE0\xF0\xF3\xF1\xEA\xE0-\xF0\xF3\xF1\xEAi\xF5
+                  \xEBi\xF2\xE0\xF0\xE0\xF2\xF3\xF0\xED\xFB\xF5 \xF1\xF3\xE2\xFF\xE7\xE5\xE9: \xD3 4 \xEA\xED.},
+  organization = {\xC0\xEA\xE0\xE4.\ \xED\xE0\xE2\xF3\xEA \xC1\xE5\xEB\xE0\xF0\xF3\xF1i. I\xED-\xF2 \xEBi\xF2.},
+  address      = {\xCCi\xED\xF1\xEA},
+  publisher    = {\xCD\xE0\xE2\xF3\xEA\xE0 i \xF2\xFD\xF5\xEDi\xEA\xE0},
+  year         = {1994},
+  volume       = {2: \xCF\xE0\xF7\xE0\xF2\xE0\xEA \xD5\xD5 \xF1\xF2. 1900--1917 \xE3\xE3.},
+  editor       = {\xC2. \xC0. \xCA\xE0\xE2\xE0\xEB\xE5\xED\xEA\xE0 and I. \xDF. \xCD\xE0\xE2\xF3\xEC\xE5\xED\xEA\xE0},
+  pagetotal    = {440},
+  language     = {russian},
+}
+ at BOOK{Grosse80,
+  author       = {\xC3\xF0\xEE\xF1\xF1\xE5, \xDD. and \xC2\xE0\xE9\xF1\xEC\xE0\xED\xE3\xE5\xEB\xFC, \xD5.},
+  title        = {\xD5\xE8\xEC\xE8\xFF \xE4\xEB\xFF \xEB\xFE\xE1\xEE\xE7\xED\xE0\xF2\xE5\xEB\xFC\xED\xFB\xF5: \xCF\xE5\xF0.\ \xF1 \xED\xE5\xEC.},
+  address      = {\xCC.},
+  publisher    = {\xD5\xE8\xEC\xE8\xFF},
+  year         = {1980},
+  pagetotal    = {392},
+  language     = {russian},
+}
+ at BOOK{GOST7184,
+  key          = {\xC3\xCE\xD1\xD2},
+  title        = {\xC3\xCE\xD1\xD2 7.1-84. \xC1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE5 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0.
+                  \xCE\xE1\xF9\xE8\xE5 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xF1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xFF.
+                  --- \xC2\xE7\xE0\xEC\xE5\xED \xC3\xCE\xD1\xD2 7.1-76~; \xE2\xE2\xE5\xE4. 01.01.86.},
+  address      = {\xCC.},
+  publisher    = {\xC8\xE7\xE4-\xE2\xEE \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xEE\xE2},
+  year         = {1984},
+  pagetotal    = {78},
+  language     = {russian},
+}
+ at BOOK{ObchTech93,
+  title        = {\xCE\xE1\xF7\xE8\xF1\xEB\xFE\xE2\xE0\xEB\xFC\xED\xE0 \xB3 \xEF\xF0\xE8\xEA\xEB\xE0\xE4\xED\xE0 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xEA\xE0: \xC7\xE1.\xED\xE0\xF3\xEA.\xEF\xF0.},
+  address      = {\xCA.},
+  publisher    = {\xCB\xE8\xE1\xB3\xE4\xFC},
+  year         = {1993},
+  pagetotal    = {99},
+  language     = {ukrainian},
+}
+ at BOOK{Bibdelo86,
+  title        = {\xC1\xE8\xE1\xEB\xE8\xEE\xF2\xE5\xF7\xED\xEE\xE5 \xE4\xE5\xEB\xEE: \xD2\xE5\xF0\xEC\xE8\xED\xEE\xEB. \xF1\xEB\xEE\xE2\xE0\xF0\xFC},
+  composer     = {\xC8. \xCC. \xD1\xF3\xF1\xEB\xEE\xE2\xE0  and \xCB. \xCD. \xD3\xEB\xE0\xED\xEE\xE2\xE0},
+  edition      = {2-\xE5 \xE8\xE7\xE4.},
+  address      = {\xCC.},
+  publisher    = {\xCA\xED\xE8\xE3\xE0},
+  year         = {1986},
+  pagetotal    = {224},
+  language     = {russian},
+}
+ at INBOOK{Ponomarenko79,
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.},
+  title        = {\xCE\xF0\xE3\xE0\xED\xE8\xE7\xF3\xFE\xF9\xE0\xFF \xF1\xE8\xF1\xF2\xE5\xEC\xE0},
+  booktitle    = {\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xFF \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xEE\xE2
+                  \xE2 \xEF\xF0\xEE\xEA\xE0\xF2\xED\xEE\xEC \xEF\xF0\xEE\xE8\xE7\xE2\xEE\xE4\xF1\xF2\xE2\xE5},
+  address      = {\xCC.},
+  publisher    = {\xCC\xE5\xF2\xE0\xEB\xEB\xF3\xF0\xE3\xE8\xFF},
+  year         = {1979},
+  pages        = {141-148},
+  language     = {russian},
+}
 @INBOOK{Zeyts70,
-    author = "\xC7\xE5\xE9\xF2\xF6, \xD4.",
-    title = "\xCE \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xE8\xE8 \xEF\xF0\xEE\xF1\xF2\xF0\xE0\xED\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xE3\xF0\xF3\xEF\xEF",
-    booktitle = "\xD1\xE8\xEC\xEC\xE5\xF2\xF0\xE8\xFF \xE2 \xF2\xE2\xE5\xF0\xE4\xEE\xEC \xF2\xE5\xEB\xE5",
-    bookauthor = "\xCD\xEE\xEA\xF1, \xD0. and \xC3\xEE\xEB\xE4, \xC0.",
-    address   = "\xCC.",
-    publisher = "\xCD\xE0\xF3\xEA\xE0",
-    year = 1970,
-    pages = "172--186",
-    language = "russian"
+  author       = {\xC7\xE5\xE9\xF2\xF6, \xD4.},
+  title        = {\xCE \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xE8\xE8 \xEF\xF0\xEE\xF1\xF2\xF0\xE0\xED\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xE3\xF0\xF3\xEF\xEF},
+  booktitle    = {\xD1\xE8\xEC\xEC\xE5\xF2\xF0\xE8\xFF \xE2 \xF2\xE2\xE5\xF0\xE4\xEE\xEC \xF2\xE5\xEB\xE5},
+  bookauthor   = {\xCD\xEE\xEA\xF1, \xD0. and \xC3\xEE\xEB\xE4, \xC0.},
+  address      = {\xCC.},
+  publisher    = {\xCD\xE0\xF3\xEA\xE0},
+  year         = {1970},
+  pages        = {172--186},
+  language     = {russian},
 }
 @INCOLLECTION{Ponoomarenko76,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.",
-    title = "\xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xEF\xF0\xE5\xF0\xFB\xE2\xE0\xED\xE8\xFF \xF1 \xF1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xEC\xE8
-      \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xE0\xEC\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8",
-    booktitle = "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xEA\xE0 \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xF1\xE8\xF1\xF2\xE5\xEC \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF 
-      \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xEC\xE8 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xE0\xEC\xE8",
-    address   = "\xD2\xE1\xE8\xEB\xE8\xF1\xE8",
-    publisher = "\xD1\xE0\xE1\xF7\xEE\xF2\xE0 \xD1\xE0\xEA\xE0\xF0\xF2\xE2\xE5\xEB\xEE",
-    year = 1976,
-    pages = "3-16",
-    language = "russian"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.},
+  title        = {\xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xEF\xF0\xE5\xF0\xFB\xE2\xE0\xED\xE8\xFF \xF1 \xF1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xEC\xE8
+                  \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xE0\xEC\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8},
+  booktitle    = {\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xEA\xE0 \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xF5 \xF1\xE8\xF1\xF2\xE5\xEC \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF
+                  \xF2\xE5\xF5\xED\xEE\xEB\xEE\xE3\xE8\xF7\xE5\xF1\xEA\xE8\xEC\xE8 \xEF\xF0\xEE\xF6\xE5\xF1\xF1\xE0\xEC\xE8},
+  address      = {\xD2\xE1\xE8\xEB\xE8\xF1\xE8},
+  publisher    = {\xD1\xE0\xE1\xF7\xEE\xF2\xE0 \xD1\xE0\xEA\xE0\xF0\xF2\xE2\xE5\xEB\xEE},
+  year         = {1976},
+  pages        = {3-16},
+  language     = {russian},
 }
- at Article{Malikov92,
-    author = "\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.",
-    title = "\xCE\xEF\xF2\xE8\xEC\xE8\xE7\xE0\xF6\xE8\xFF \xF6\xE8\xF4\xF0\xEE\xE2\xEE\xE9 \xF1\xE5\xF2\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xFC\xED\xEE\xE3\xEE \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF 
-      \xF1 \xEA\xEE\xED\xE5\xF7\xED\xFB\xEC \xF7\xE8\xF1\xEB\xEE\xEC \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9 \xE8 \xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xEA\xE0\xEC\xE8",
-    journal = "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xEA\xE0 \xE8 \xF2\xE5\xEB\xE5\xEC\xE5\xF5\xE0\xED\xE8\xEA\xE0",
-    year = 1992,
-    number =  6,
-    pages = "34-38",
-    language = "russian"
+ at ARTICLE{Malikov92,
+  author       = {\xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0.},
+  title        = {\xCE\xEF\xF2\xE8\xEC\xE8\xE7\xE0\xF6\xE8\xFF \xF6\xE8\xF4\xF0\xEE\xE2\xEE\xE9 \xF1\xE5\xF2\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xFC\xED\xEE\xE3\xEE \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF
+                  \xF1 \xEA\xEE\xED\xE5\xF7\xED\xFB\xEC \xF7\xE8\xF1\xEB\xEE\xEC \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9 \xE8 \xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xEA\xE0\xEC\xE8},
+  journal      = {\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xEA\xE0 \xE8 \xF2\xE5\xEB\xE5\xEC\xE5\xF5\xE0\xED\xE8\xEA\xE0},
+  year         = {1992},
+  number       = {6},
+  pages        = {34-38},
+  language     = {russian},
 }
- at Article{Ponomarenko86a,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7.",
-    title = "\xD1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xEE\xE5 \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xEC\xED\xEE\xE3\xEE\xEA\xE0\xED\xE0\xEB\xFC\xED\xEE\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xEE\xE9 
-      \xF1 \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xEE\xE9 \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF \xED\xE5\xEE\xE4\xED\xEE\xF0\xEE\xE4\xED\xEE\xE3\xEE \xEF\xEE\xF2\xEE\xEA\xE0",
-    journal = "\xC8\xE7\xE2.\ \xC0\xCD \xC0\xE7\xE5\xF0\xE1.\ \xD0\xE5\xF1\xEF. \xD1\xE5\xF0.\ \xF4\xE8\xE7.-\xF2\xE5\xF5\xED.\ \xE8 \xEC\xE0\xF2.\ \xED\xE0\xF3\xEA",
-    year = 1986,
-    volume = 7,
-    number = 6,
-    pages = "79-83",
-    language = "russian"
+ at ARTICLE{Ponomarenko86a,
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xCC\xE5\xEB\xE8\xEA\xEE\xE2, \xC0. \xC7.},
+  title        = {\xD1\xE8\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xEE\xE5 \xF3\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xEC\xED\xEE\xE3\xEE\xEA\xE0\xED\xE0\xEB\xFC\xED\xEE\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xEE\xE9
+                  \xF1 \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xEE\xE9 \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xEE\xE9 \xEE\xE1\xF1\xEB\xF3\xE6\xE8\xE2\xE0\xED\xE8\xFF \xED\xE5\xEE\xE4\xED\xEE\xF0\xEE\xE4\xED\xEE\xE3\xEE \xEF\xEE\xF2\xEE\xEA\xE0},
+  journal      = {\xC8\xE7\xE2.\ \xC0\xCD \xC0\xE7\xE5\xF0\xE1.\ \xD0\xE5\xF1\xEF. \xD1\xE5\xF0.\ \xF4\xE8\xE7.-\xF2\xE5\xF5\xED.\ \xE8 \xEC\xE0\xF2.\ \xED\xE0\xF3\xEA},
+  year         = {1986},
+  volume       = {7},
+  number       = {6},
+  pages        = {79-83},
+  language     = {russian},
 }
- at Article{   dixit.pindyck:options,
-  title = {The Options Approach to Capital Investment},
-  author = {Avinash K. Dixit and Robert S. Pindyck},
-  journal = {Harvard Business Review},
-  year = {1995},
-  month = {May-June},
-  pages = {105--115}
+ at ARTICLE{dixit.pindyck:options,
+  title        = {The Options Approach to Capital Investment},
+  author       = {Avinash K. Dixit and Robert S. Pindyck},
+  journal      = {Harvard Business Review},
+  year         = {1995},
+  month        = {May-June},
+  pages        = {105--115},
 }
 @ARTICLE{RosGaz-article,
-    title = "\xD4\xE5\xE4\xE5\xF0\xE0\xEB\xFC\xED\xFB\xE9 \xE7\xE0\xEA\xEE\xED \xEE \xE2\xED\xE5\xF1\xE5\xED\xE8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE9 
-      \xE8 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE9 \xE2 \xD1\xE5\xEC\xE5\xE9\xED\xFB\xE9 \xEA\xEE\xE4\xE5\xEA\xF1 \xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xEE\xE9 \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xE8",
-    journal = "\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xE3\xE0\xE7\xE5\xF2\xE0",
-    year = 1997,
-    month = "19 \xED\xEE\xFF\xE1",
-    pages = 4,
-    note = "\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF. \xC7\xE0\xEA\xEE\xED\xFB",
-    language = "russian"
+  title        = {\xD4\xE5\xE4\xE5\xF0\xE0\xEB\xFC\xED\xFB\xE9 \xE7\xE0\xEA\xEE\xED \xEE \xE2\xED\xE5\xF1\xE5\xED\xE8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE9
+                  \xE8 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE9 \xE2 \xD1\xE5\xEC\xE5\xE9\xED\xFB\xE9 \xEA\xEE\xE4\xE5\xEA\xF1 \xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xEE\xE9 \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xE8},
+  journal      = {\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xE3\xE0\xE7\xE5\xF2\xE0},
+  year         = {1997},
+  month        = {19 \xED\xEE\xFF\xE1},
+  pages        = {4},
+  note         = {\xD0\xEE\xF1\xF1\xE8\xE9\xF1\xEA\xE0\xFF \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF. \xC7\xE0\xEA\xEE\xED\xFB},
+  language     = {russian},
 }
 @INBOOK{Dolmatovskiy88,
-    author = "\xC4\xEE\xEB\xEC\xE0\xF2\xEE\xE2\xF1\xEA\xE8\xE9, \xDE. \xC0.",
-    title = "\xDD\xEB\xE5\xEA\xF2\xF0\xEE\xEC\xEE\xE1\xE8\xEB\xFC",
-    booktitle = "\xC1\xD1\xDD",
-    edition = "3-\xE5",
-    address   = "\xCC.",
-    year = 1988,
-    volume = 30,
-    pages = 72,
-    language = "russian"
+  author       = {\xC4\xEE\xEB\xEC\xE0\xF2\xEE\xE2\xF1\xEA\xE8\xE9, \xDE. \xC0.},
+  title        = {\xDD\xEB\xE5\xEA\xF2\xF0\xEE\xEC\xEE\xE1\xE8\xEB\xFC},
+  booktitle    = {\xC1\xD1\xDD},
+  edition      = {3-\xE5},
+  address      = {\xCC.},
+  year         = {1988},
+  volume       = {30},
+  pages        = {72},
+  language     = {russian},
 }
 @INPROCEEDINGS{Ponomarenko88,
-    author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC6\xF3\xF7\xEA\xEE\xE2\xE0, \xC8. \xC2.",
-    title = "\xCE\xEF\xF2\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xED\xE0\xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xEE\xE2 
-      \xEF\xF0\xE8 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8 \xE4\xEE\xF1\xF2\xF3\xEF\xE0 \xE2 \xEB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xF5 
-      \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xF1\xE5\xF2\xFF\xF5 \xC0\xD1\xD3\xD2\xCF",
-    booktitle = {\xD2\xF0\xF3\xE4\xFB \xCC\xE5\xE6\xE4\xF3\xED\xE0\xF0.\ \xEA\xEE\xED\xF4.\ 
-      <<\xCB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xE5 \xF1\xE5\xF2\xE8>> (\xCB\xCE\xCA\xD1\xC5\xD2\xDC 88)},
-    volume = 1,
-    address   = "\xD0\xE8\xE3\xE0",
-    publisher = "\xC8\xDD\xC2\xD2 \xC0\xCD \xCB\xE0\xF2\xE2\xE8\xE8",
-    year = 1988,
-    pages = "149-153",
-    language = "russian"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC6\xF3\xF7\xEA\xEE\xE2\xE0, \xC8. \xC2.},
+  title        = {\xCE\xEF\xF2\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xED\xE0\xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 \xEF\xF0\xE8\xEE\xF0\xE8\xF2\xE5\xF2\xEE\xE2
+                  \xEF\xF0\xE8 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8 \xE4\xEE\xF1\xF2\xF3\xEF\xE0 \xE2 \xEB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xF5
+                  \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xF1\xE5\xF2\xFF\xF5 \xC0\xD1\xD3\xD2\xCF},
+  booktitle    = {\xD2\xF0\xF3\xE4\xFB \xCC\xE5\xE6\xE4\xF3\xED\xE0\xF0.\ \xEA\xEE\xED\xF4.\
+                  <<\xCB\xEE\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xE2\xFB\xF7\xE8\xF1\xEB\xE8\xF2\xE5\xEB\xFC\xED\xFB\xE5 \xF1\xE5\xF2\xE8>> (\xCB\xCE\xCA\xD1\xC5\xD2\xDC 88)},
+  volume       = {1},
+  address      = {\xD0\xE8\xE3\xE0},
+  publisher    = {\xC8\xDD\xC2\xD2 \xC0\xCD \xCB\xE0\xF2\xE2\xE8\xE8},
+  year         = {1988},
+  pages        = {149-153},
+  language     = {russian},
 }
 @INPROCEEDINGS{Melikov95,
-    author = "Melikov, A. Z. and Ponomarenko, L. A.",
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+  author       = {Melikov, A. Z. and Ponomarenko, L. A.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }
 @INPROCEEDINGS{Gojchuk98,
-    author="\xC3\xEE\xE9\xF7\xF3\xEA, \xC0. \xD4.",
-    title="\xCE\xF1\xEE\xE1\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE5\xF2\xB3\xEE\xEB\xEE㳿 \xB3 \xEF\xE0\xF2\xEE\xE3\xE5\xED\xE5\xE7\xF3 \xEF\xEE\xEF\xE5\xF0\xE5\xF7\xED\xEE\xE3\xEE \xF0\xE0\xEA\xF3 
-      \xE4\xF3\xE1\xE0 \xE7\xE2\xE8\xF7\xE0\xE9\xED\xEE\xE3\xEE \xE2 \xD3\xEA\xF0\xE0\xBF\xED\xB3",
-    booktitle="\xCD\xE0\xF3\xEA\xEE\xE2\xE8\xE9 \xE2\xB3\xF1\xED\xE8\xEA \xCD\xE0\xF6\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xE3\xEE 
-      \xE0\xE3\xF0\xE0\xF0\xED\xEE\xE3\xEE \xF3\xED\xB3\xE2\xE5\xF0\xF1\xE8\xF2\xE5\xF2\xF3",
-    editor="\xCC\xE5\xEB\xFC\xED\xE8\xF7\xF3\xEA\xE0, \xC4. \xCE. and others",
-    address="\xCA.",
-    publisher="\xCD\xC0\xD3",
-    year=1998,
-    series="\xC2\xE8\xEF. 8: ˳\xF1\xB3\xE2\xED\xE8\xF6\xF2\xE2\xEE",
-    pages="168--173",
-    language="ukrainian"
+  author       = {\xC3\xEE\xE9\xF7\xF3\xEA, \xC0. \xD4.},
+  title        = {\xCE\xF1\xEE\xE1\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE5\xF2\xB3\xEE\xEB\xEE㳿 \xB3 \xEF\xE0\xF2\xEE\xE3\xE5\xED\xE5\xE7\xF3 \xEF\xEE\xEF\xE5\xF0\xE5\xF7\xED\xEE\xE3\xEE \xF0\xE0\xEA\xF3
+                  \xE4\xF3\xE1\xE0 \xE7\xE2\xE8\xF7\xE0\xE9\xED\xEE\xE3\xEE \xE2 \xD3\xEA\xF0\xE0\xBF\xED\xB3},
+  booktitle    = {\xCD\xE0\xF3\xEA\xEE\xE2\xE8\xE9 \xE2\xB3\xF1\xED\xE8\xEA \xCD\xE0\xF6\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xE3\xEE
+                  \xE0\xE3\xF0\xE0\xF0\xED\xEE\xE3\xEE \xF3\xED\xB3\xE2\xE5\xF0\xF1\xE8\xF2\xE5\xF2\xF3},
+  editor       = {\xCC\xE5\xEB\xFC\xED\xE8\xF7\xF3\xEA\xE0, \xC4. \xCE. and others},
+  address      = {\xCA.},
+  publisher    = {\xCD\xC0\xD3},
+  year         = {1998},
+  series       = {\xC2\xE8\xEF. 8: ˳\xF1\xB3\xE2\xED\xE8\xF6\xF2\xE2\xEE},
+  pages        = {168--173},
+  language     = {ukrainian},
 }
 
 @INPROCEEDINGS{Polyakov98a,
-    author="\xCC. \xCE. \xCF\xEE\xEB\xFF\xEA\xEE\xE2",
-    title="\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE8\xE9 \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xF1\xB3\xEA \xE2 \xF3\xEF\xF0\xE0\xE2\xEB\xB3\xED\xED\xB3
-      \xEB\xB3\xF1\xEE\xE2\xE8\xEC\xE8 \xF0\xE5\xF1\xF3\xF0\xF1\xE0\xEC\xE8 \xED\xE0 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xEC\xF3 \xF0\xB3\xE2\xED\xB3",
-    crossref="Gojchuk98",
-    annote = "\xD0\xEE\xE7\xE3\xEB\xFF\xED\xF3\xF2\xEE \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE0\xF0\xED\xE8\xF5
-      \xE3\xEE\xF1\xEF\xEE\xE4\xE0\xF0\xF1\xFC\xEA\xE8\xF5 \xEE\xE4\xE8\xED\xE8\xF6\xFC \xED\xE0 \xF0\xEE\xE7\xEC\xB3\xF0 \xF0\xEE\xE7\xF0\xE0\xF5\xF3\xED\xEA\xEE\xE2\xEE\xBF \xEB\xB3\xF1\xEE\xF1\xB3\xEA\xE8.
-      \xC7\xE0\xEF\xF0\xEE\xEF\xEE\xED\xEE\xE2\xE0\xED\xEE \xEC\xE5\xF2\xEE\xE4 \xE2\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF \xEC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE \xE4\xEE\xEF\xF3\xF1\xF2\xE8\xEC\xEE\xE3\xEE \xF0\xEE\xE7\xEC\xB3\xF0\xF3
-      \xF0\xF3\xE1\xE0\xED\xED\xFF \xE7\xE0 \xEF\xEB\xEE\xF9\xE5\xFE \xED\xE0 \xF0\xB3\xE2\xED\xB3 \xF0\xE5\xE3\xB3\xEE\xED\xF3 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xB3 \xF1\xE8\xF1\xF2\xE5\xEC\xE8
-      \xE4\xE5\xF0\xE6\xE0\xE2\xED\xEE\xE3\xEE \xF0\xE5\xE3\xF3\xEB\xFE\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xED\xED\xFF \xE4\xEB\xFF \xF3\xEC\xEE\xE2 \xF0\xE8\xED\xEA\xEE\xE2\xEE\xBF
-      \xE5\xEA\xEE\xED\xEE\xEC\xB3\xEA\xE8",
-    pages="213--220"
+  author       = {\xCC. \xCE. \xCF\xEE\xEB\xFF\xEA\xEE\xE2},
+  title        = {\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE8\xE9 \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xF1\xB3\xEA \xE2 \xF3\xEF\xF0\xE0\xE2\xEB\xB3\xED\xED\xB3
+                  \xEB\xB3\xF1\xEE\xE2\xE8\xEC\xE8 \xF0\xE5\xF1\xF3\xF0\xF1\xE0\xEC\xE8 \xED\xE0 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xEB\xFC\xED\xEE\xEC\xF3 \xF0\xB3\xE2\xED\xB3},
+  crossref     = {Gojchuk98},
+  annote       = {\xD0\xEE\xE7\xE3\xEB\xFF\xED\xF3\xF2\xEE \xE5\xF4\xE5\xEA\xF2 \xE0\xE3\xF0\xE5\xE3\xF3\xE2\xE0\xED\xED\xFF \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE0\xF0\xED\xE8\xF5
+                  \xE3\xEE\xF1\xEF\xEE\xE4\xE0\xF0\xF1\xFC\xEA\xE8\xF5 \xEE\xE4\xE8\xED\xE8\xF6\xFC \xED\xE0 \xF0\xEE\xE7\xEC\xB3\xF0 \xF0\xEE\xE7\xF0\xE0\xF5\xF3\xED\xEA\xEE\xE2\xEE\xBF \xEB\xB3\xF1\xEE\xF1\xB3\xEA\xE8.
+                  \xC7\xE0\xEF\xF0\xEE\xEF\xEE\xED\xEE\xE2\xE0\xED\xEE \xEC\xE5\xF2\xEE\xE4 \xE2\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF \xEC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE \xE4\xEE\xEF\xF3\xF1\xF2\xE8\xEC\xEE\xE3\xEE \xF0\xEE\xE7\xEC\xB3\xF0\xF3
+                  \xF0\xF3\xE1\xE0\xED\xED\xFF \xE7\xE0 \xEF\xEB\xEE\xF9\xE5\xFE \xED\xE0 \xF0\xB3\xE2\xED\xB3 \xF0\xE5\xE3\xB3\xEE\xED\xF3 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xB3 \xF1\xE8\xF1\xF2\xE5\xEC\xE8
+                  \xE4\xE5\xF0\xE6\xE0\xE2\xED\xEE\xE3\xEE \xF0\xE5\xE3\xF3\xEB\xFE\xE2\xE0\xED\xED\xFF \xEB\xB3\xF1\xEE\xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xED\xED\xFF \xE4\xEB\xFF \xF3\xEC\xEE\xE2 \xF0\xE8\xED\xEA\xEE\xE2\xEE\xBF
+                  \xE5\xEA\xEE\xED\xEE\xEC\xB3\xEA\xE8},
+  pages        = {213--220},
 }
-
- @INPROCEEDINGS{TranskSpivrob99:Purich,
-    author = "\xCF\xF3\xF0\xE8\xF7, \xD8\xF2\xE5\xF4\xE0\xED",
-    title = "{\xD0}\xF3\xEC\xFB\xED\xF1\xEA\xEE-{\xD3}\xEA\xF0\xE0\xE8\xED\xF1\xEA\xEE\xE5 \xF2\xF0\xE0\xED\xF1\xE3\xF0\xE0\xED\xE8\xF7\xED\xEE\xE5 \xF1\xEE\xF2\xF0\xF3\xE4\xED\xE8\xF7\xE5\xF1\xF2\xE2\xEE: 
-      \xEF\xF0\xEE\xE1\xEB\xE5\xEC\xFB  \xE8 \xEF\xE5\xF0\xF1\xEF\xE5\xEA\xF2\xE8\xE2\xFB",
-    language = "russian",
-    booktitle = "\xD2\xF0\xE0\xED\xF1\xEA\xEE\xF0\xE4\xEE\xED\xED\xE5 \xF1\xEF\xB3\xE2\xF0\xEE\xE1\xB3\xF2\xED\xE8\xF6\xF2\xE2\xEE \xF3 \xEF\xEE\xEB\xB3\xE5\xF2\xED\xB3\xF7\xED\xE8\xF5 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xF5
-      {\xD1}\xF5\xB3\xE4\xED\xEE\xBF \xF2\xE0 {\xCF}\xB3\xE2\xE4\xE5\xED\xED\xEE-{\xD1}\xF5\xB3\xE4\xED\xEE\xBF {\xAA}\xE2\xF0\xEE\xEF\xE8: {\xCC}\xE0\xF2\xE5\xF0\xB3\xE0\xEB\xE8 \xED\xE0\xF3\xEA\xEE\xE2\xEE\xE3\xEE
-      \xF1\xE8\xEC\xEF\xEE\xE7\xB3\xF3\xEC\xF3",
-    editor = "\xCC\xE0\xEA\xE0\xF0\xE0, \xDE.",
-    address = "\xD7\xE5\xF0\xED\xB3\xE2\xF6\xB3",
-    publisher = "\xC7\xEE\xEB\xEE\xF2\xB3 \xEB\xE8\xF2\xE0\xE2\xF0\xE8",
-    organization = "\xC1\xF3\xEA\xEE\xE2\xE8\xED\xF1\xFC\xEA\xE8\xE9 \xEF\xEE\xEB\xB3\xF2\xEE\xEB\xEE\xE3\xB3\xF7\xED\xE8\xE9 \xF6\xE5\xED\xF2\xF0",
-    year = 1999,
-    pagetotal = 196,
-    booklanguage = "ukrainian"
+ at INPROCEEDINGS{TranskSpivrob99:Purich,
+  author       = {\xCF\xF3\xF0\xE8\xF7, \xD8\xF2\xE5\xF4\xE0\xED},
+  title        = {{\xD0}\xF3\xEC\xFB\xED\xF1\xEA\xEE-{\xD3}\xEA\xF0\xE0\xE8\xED\xF1\xEA\xEE\xE5 \xF2\xF0\xE0\xED\xF1\xE3\xF0\xE0\xED\xE8\xF7\xED\xEE\xE5 \xF1\xEE\xF2\xF0\xF3\xE4\xED\xE8\xF7\xE5\xF1\xF2\xE2\xEE:
+                  \xEF\xF0\xEE\xE1\xEB\xE5\xEC\xFB  \xE8 \xEF\xE5\xF0\xF1\xEF\xE5\xEA\xF2\xE8\xE2\xFB},
+  language     = {russian},
+  booktitle    = {\xD2\xF0\xE0\xED\xF1\xEA\xEE\xF0\xE4\xEE\xED\xED\xE5 \xF1\xEF\xB3\xE2\xF0\xEE\xE1\xB3\xF2\xED\xE8\xF6\xF2\xE2\xEE \xF3 \xEF\xEE\xEB\xB3\xE5\xF2\xED\xB3\xF7\xED\xE8\xF5 \xF0\xE5\xE3\xB3\xEE\xED\xE0\xF5
+                  {\xD1}\xF5\xB3\xE4\xED\xEE\xBF \xF2\xE0 {\xCF}\xB3\xE2\xE4\xE5\xED\xED\xEE-{\xD1}\xF5\xB3\xE4\xED\xEE\xBF {\xAA}\xE2\xF0\xEE\xEF\xE8: {\xCC}\xE0\xF2\xE5\xF0\xB3\xE0\xEB\xE8 \xED\xE0\xF3\xEA\xEE\xE2\xEE\xE3\xEE
+                  \xF1\xE8\xEC\xEF\xEE\xE7\xB3\xF3\xEC\xF3},
+  editor       = {\xCC\xE0\xEA\xE0\xF0\xE0, \xDE.},
+  address      = {\xD7\xE5\xF0\xED\xB3\xE2\xF6\xB3},
+  publisher    = {\xC7\xEE\xEB\xEE\xF2\xB3 \xEB\xE8\xF2\xE0\xE2\xF0\xE8},
+  organization = {\xC1\xF3\xEA\xEE\xE2\xE8\xED\xF1\xFC\xEA\xE8\xE9 \xEF\xEE\xEB\xB3\xF2\xEE\xEB\xEE\xE3\xB3\xF7\xED\xE8\xE9 \xF6\xE5\xED\xF2\xF0},
+  year         = {1999},
+  pagetotal    = {196},
+  booklanguage = {ukrainian},
 }
- @INPROCEEDINGS{Selikov95,
-    author = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515"
+ at INPROCEEDINGS{Selikov95,
+  author       = {Selikov, A. Z. and Ponomarenko, L. A. and Qranamarenko, L. S. and Zonomarenko, L. U.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
 }
 
 @INPROCEEDINGS{Selikov+95,
-    author = {\xD1\xE5\xEB\xE8\xEA\xEE\xE2, A. Z. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xFC, L. A. and \xCA\xF0\xE0\xEC\xE0\xF0\xE5\xED\xEA\xEE, L. S. and \xC7\xEE\xEB\xEA\xE8\xED, \xCB. \xDE.},
-    title = "On the approach to optimal control 
-      of queuing systems with multiple classes of customers",
-    booktitle = "Proc.\ International Conf.\ on Syst.\ Sci.\ XII.",
-    address   = "Wroclaw (Poland)",
-    year = 1995,
-    pages = "507-515",
-    language = "russian"
+  author       = {\xD1\xE5\xEB\xE8\xEA\xEE\xE2, A. Z. and \xCF\xEE\xED\xEE\xEC\xE0\xF0\xFC, L. A. and \xCA\xF0\xE0\xEC\xE0\xF0\xE5\xED\xEA\xEE, L. S. and \xC7\xEE\xEB\xEA\xE8\xED, \xCB. \xDE.},
+  title        = {On the approach to optimal control
+                  of queuing systems with multiple classes of customers},
+  booktitle    = {Proc.\ International Conf.\ on Syst.\ Sci.\ XII.},
+  address      = {Wroclaw (Poland)},
+  year         = {1995},
+  pages        = {507-515},
+  language     = {russian},
 }
 @PHDTHESIS{Luus82,
-  author = "\xCB\xF3\xF3\xF1, \xD0\xEE\xEC\xE0\xED  \xC0\xF0\xEA\xE0\xE4\xFC\xE5\xE2\xE8\xF7",
-  title = "\xC8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE5 \xEE\xE1\xEE\xF0\xF3\xE4\xEE\xE2\xE0\xED\xE8\xFF \xF1 \xEF\xED\xE5\xE2\xEC\xEE\xE2\xE0\xEA\xF3\xF3\xEC\xED\xFB\xEC 
-    \xEF\xF0\xE8\xE2\xEE\xE4\xEE\xEC \xE4\xEB\xFF \xE7\xE0\xF5\xE2\xE0\xF2\xE0, \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xE8\xFF \xE8 \xF4\xE8\xEA\xF1\xE0\xF6\xE8\xE8 
-    \xEF\xF0\xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE5 \xEF\xEE\xF0\xE8\xF1\xF2\xFB\xF5 \xE8 \xEB\xE5\xE3\xEA\xEE\xEF\xEE\xE2\xF0\xE5\xE6\xE4\xE0\xE5\xEC\xFB\xF5 
-    \xF1\xF2\xF0\xEE\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xE7\xE4\xE5\xEB\xE8\xE9",
-  type = "\xC4\xE8\xF1\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8 \xEA\xE0\xED\xE4\xE8\xE4\xE0\xF2\xE0 \xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xED\xE0\xF3\xEA",
-  number = "05.05.04",
-  school = "\xCC\xEE\xF1\xEA.\ \xF1\xF2\xF0\xEE\xE8\xF2.\ \xE8\xED-\xF2",
-  address   = "\xCC.",
-  year = 1982,
-  pagetotal = 212,
-  language = "russian"
+  author       = {\xCB\xF3\xF3\xF1, \xD0\xEE\xEC\xE0\xED  \xC0\xF0\xEA\xE0\xE4\xFC\xE5\xE2\xE8\xF7},
+  title        = {\xC8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE5 \xEE\xE1\xEE\xF0\xF3\xE4\xEE\xE2\xE0\xED\xE8\xFF \xF1 \xEF\xED\xE5\xE2\xEC\xEE\xE2\xE0\xEA\xF3\xF3\xEC\xED\xFB\xEC
+                  \xEF\xF0\xE8\xE2\xEE\xE4\xEE\xEC \xE4\xEB\xFF \xE7\xE0\xF5\xE2\xE0\xF2\xE0, \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xE8\xFF \xE8 \xF4\xE8\xEA\xF1\xE0\xF6\xE8\xE8
+                  \xEF\xF0\xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE5 \xEF\xEE\xF0\xE8\xF1\xF2\xFB\xF5 \xE8 \xEB\xE5\xE3\xEA\xEE\xEF\xEE\xE2\xF0\xE5\xE6\xE4\xE0\xE5\xEC\xFB\xF5
+                  \xF1\xF2\xF0\xEE\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xE7\xE4\xE5\xEB\xE8\xE9},
+  type         = {\xC4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8 \xEA\xE0\xED\xE4\xE8\xE4\xE0\xF2\xE0 \xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xED\xE0\xF3\xEA},
+  number       = {05.05.04},
+  institution  = {\xCC\xEE\xF1\xEA.\ \xF1\xF2\xF0\xEE\xE8\xF2.\ \xE8\xED-\xF2},
+  address      = {\xCC.},
+  year         = {1982},
+  pagetotal    = {212},
+  language     = {russian},
 }
- at DSciTHESIS{KIA95-default,
-  author = "\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8\xE3\xEE\xF0\xFC \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0\xEE\xE2\xE8\xF7",
-  title = "\xD2\xE5\xEE\xF0\xE8\xFF \xEC\xE0\xE3\xED\xE8\xF2\xED\xEE\xE3\xEE \xF3\xE4\xE5\xF0\xE6\xE0\xED\xE8\xFF \xE4\xE2\xF3\xF5\xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xED\xEE\xE9 \xEF\xEB\xE0\xE7\xEC\xFB 
-      \xE2 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEB\xEE\xE2\xF3\xF8\xEA\xE0\xF5",
-  number = "01.04.08",
-  school = "\xC8\xED-\xF2 \xFF\xE4\xE5\xF0\xED\xEE\xE9 \xF4\xE8\xE7\xE8\xEA\xE8 \xE8\xEC.\ \xC3.~\xC8. \xC1\xF3\xE4\xEA\xE5\xF0\xE0 \xD1\xCE \xD0\xC0\xCD",
-  address   = "\xCD\xEE\xE2\xEE\xF1\xE8\xE1\xE8\xF0\xF1\xEA",
-  year = 1995,
-  pagetotal = 350,
-  language = "russian"
+ at DOCTHESIS{KIA95-default,
+  author       = {\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8\xE3\xEE\xF0\xFC \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0\xEE\xE2\xE8\xF7},
+  title        = {\xD2\xE5\xEE\xF0\xE8\xFF \xEC\xE0\xE3\xED\xE8\xF2\xED\xEE\xE3\xEE \xF3\xE4\xE5\xF0\xE6\xE0\xED\xE8\xFF \xE4\xE2\xF3\xF5\xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xED\xEE\xE9 \xEF\xEB\xE0\xE7\xEC\xFB
+                  \xE2 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEB\xEE\xE2\xF3\xF8\xEA\xE0\xF5},
+  number       = {01.04.08},
+  institution  = {\xC8\xED-\xF2 \xFF\xE4\xE5\xF0\xED\xEE\xE9 \xF4\xE8\xE7\xE8\xEA\xE8 \xE8\xEC.\ \xC3.~\xC8. \xC1\xF3\xE4\xEA\xE5\xF0\xE0 \xD1\xCE \xD0\xC0\xCD},
+  address      = {\xCD\xEE\xE2\xEE\xF1\xE8\xE1\xE8\xF0\xF1\xEA},
+  year         = {1995},
+  pagetotal    = {350},
+  language     = {russian},
 }
- at THESIS{KIA85-autoref,
-  author = "\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8\xE3\xEE\xF0\xFC \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0\xEE\xE2\xE8\xF7",
-  title = "\xD2\xE5\xEE\xF0\xE8\xFF \xEC\xE0\xE3\xED\xE8\xF2\xED\xEE\xE3\xEE \xF3\xE4\xE5\xF0\xE6\xE0\xED\xE8\xFF \xE4\xE2\xF3\xF5\xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xED\xEE\xE9 \xEF\xEB\xE0\xE7\xEC\xFB 
-      \xE2 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEB\xEE\xE2\xF3\xF8\xEA\xE0\xF5",
-  type = "\xC0\xE2\xF2\xEE\xF0\xE5\xF4.\ \xE4\xE8\xF1.\ \xED\xE0 \xF1\xEE\xE8\xF1\xEA.\ \xF3\xF7\xE5\xED.\ \xF1\xF2\xE5\xEF.\ \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2.\ \xED\xE0\xF3\xEA",
-  number = "01.04.08",
-  school = "\xC8\xED-\xF2 \xFF\xE4\xE5\xF0\xED\xEE\xE9 \xF4\xE8\xE7\xE8\xEA\xE8 \xE8\xEC.\ \xC3.~\xC8. \xC1\xF3\xE4\xEA\xE5\xF0\xE0 \xD1\xCE \xD0\xC0\xCD",
-  address = "\xCD\xEE\xE2\xEE\xF1\xE8\xE1\xE8\xF0\xF1\xEA",
-  year = 1995,
-  pagetotal = 17,
-  language = "russian"
+ at MASTERSTHESIS{mastersthesis-minimal,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  year         = {1988},
+  institution  = {Stanford University},
 }
+
+ at MASTERSTHESIS{mastersthesis-full,
+  title        = {Mastering Thesis Writing},
+  author       = {{\'{E}}douard Masterly},
+  month        = jun,
+  note         = {This is a full MASTERSTHESIS entry},
+  type         = {Master's project},
+  year         = {1988},
+  address      = {English Department},
+  institution  = {Stanford University},
+}
 @BOOK{Ponomarenko76,
-  author = "\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC1\xF3\xE0\xE4\xE7\xE5, \xC2. \xC2.",
-  title = "\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xE8 \xE0\xEB\xE3\xEE\xF0\xE8\xF2\xEC\xFB \xF1\xE1\xEE\xF0\xE0 
-    \xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xED\xE5\xEF\xF0\xE5\xF0\xFB\xE2\xED\xFB\xF5 
-    \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8",
-  address   = "\xCA.",
-  year = 1976,
-  pagetotal = 37,
-  language = "russian",
-  note = "(\xCF\xF0\xE5\xEF\xF0./ \xC0\xCD \xD3\xEA\xF0\xE0\xE8\xED\xFB. \xC8\xED-\xF2 \xEA\xE8\xE1\xE5\xF0\xED\xE5\xF2\xE8\xEA\xE8; 76-76)"
+  author       = {\xCF\xEE\xED\xEE\xEC\xE0\xF0\xE5\xED\xEA\xEE, \xCB. \xC0. and \xC1\xF3\xE0\xE4\xE7\xE5, \xC2. \xC2.},
+  title        = {\xCC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xEC\xEE\xE4\xE5\xEB\xE8 \xE8 \xE0\xEB\xE3\xEE\xF0\xE8\xF2\xEC\xFB \xF1\xE1\xEE\xF0\xE0
+                  \xE8 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xE8 \xE2 \xC0\xD1\xD3\xD2\xCF \xED\xE5\xEF\xF0\xE5\xF0\xFB\xE2\xED\xFB\xF5
+                  \xF1\xF2\xE0\xED\xEE\xE2 \xE3\xEE\xF0\xFF\xF7\xE5\xE9 \xEF\xF0\xEE\xEA\xE0\xF2\xEA\xE8},
+  address      = {\xCA.},
+  year         = {1976},
+  pagetotal    = {37},
+  language     = {russian},
+  note         = {(\xCF\xF0\xE5\xEF\xF0./ \xC0\xCD \xD3\xEA\xF0\xE0\xE8\xED\xFB. \xC8\xED-\xF2 \xEA\xE8\xE1\xE5\xF0\xED\xE5\xF2\xE8\xEA\xE8; 76-76)},
 }
 @REPORT{Report81-rep,
-  title = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9 
-    \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7} 
-    \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
-  institution = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
-  address   = "\xCC.",
+  title        = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9
+                  \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7}
+                  \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
+  institution  = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
+  address      = {\xCC.},
   organization = {\xC2\xC8\xCD\xC8\xD2\xC8},
-  year = 1981,
-  pagetotal = 90,
-  type = "\xCE\xF2\xF7\xE5\xF2 \xEE {\xCD\xC8\xD0}",
-  editor = "\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.",
-  author = "\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others",
-  note = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  type         = {\xCE\xF2\xF7\xE5\xF2 \xEE {\xCD\xC8\xD0}},
+  editor       = {\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.},
+  author       = {\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others},
+  note         = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
+  language     = {russian},
 }
 @REPORT{Report81b-rep-notype,
-  title = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9 
-    \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7} 
-    \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
-  institution = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
-  address   = "\xCC.",
+  title        = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9
+                  \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7}
+                  \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
+  institution  = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
+  address      = {\xCC.},
   organization = {\xC2\xC8\xCD\xC8\xD2\xC8},
-  year = 1981,
-  pagetotal = 90,
-  note = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  note         = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
+  language     = {russian},
 }
 @TECHREPORT{Report81-techrep,
-  title = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9 
-    \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7} 
-    \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
-  institution = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
-  address   = "\xCC.",
+  title        = {\xCF\xF0\xEE\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE8\xF1\xEF\xFB\xF2\xE0\xED\xE8\xE9 \xE8 \xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xE9
+                  \xF2\xE5\xEF\xEB\xEE\xF2\xE5\xF5\xED\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE2\xEE\xE9\xF1\xF2\xE2 \xEA\xE0\xEC\xE5\xF0 {\xCA\xD5\xD1-2-12-\xC2\xC7}
+                  \xE8 {\xCA\xD5\xD1-2-12-\xCADz\xCE}},
+  institution  = {\xC2\xF1\xE5\xF1\xEE\xFE\xE7\xED.\ \xE7\xE0\xEE\xF7\xED.\ \xE8\xED-\xF2 \xEF\xE8\xF9.\ \xEF\xF0\xEE\xEC-\xF2\xE8},
+  address      = {\xCC.},
   organization = {\xC2\xC8\xCD\xC8\xD2\xC8},
-  year = 1981,
-  pagetotal = 90,
-  editor = "\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.",
-  author = "\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others",
-  note = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
-  language = "russian"
+  year         = {1981},
+  pagetotal    = {90},
+  editor       = {\xCF\xF3\xF2\xE8\xED, \xC2. \xC2.},
+  author       = {\xCC\xE5\xE4\xE2\xE5\xE4\xE5\xE2, \xC4. \xC0. and others},
+  note         = {\xC8\xED\xE2.\ \xB9 \xC2 119692},
+  language     = {russian},
 }
 @BOOK{CatalogMamals81,
-    title = {\xCA\xE0\xF2\xE0\xEB\xEE\xE3 \xEC\xEB\xE5\xEA\xEE\xEF\xE8\xF2\xE0\xFE\xF9\xE8\xF5 \xD1\xD1\xD1\xD0. 
-      \xCF\xEB\xE8\xEE\xF6\xE5\xED "--- \xF1\xEE\xE2\xF0\xE5\xEC\xE5\xED\xED\xEE\xF1\xF2\xFC},
-    organization = "\xC0\xCD \xD1\xD1\xD1\xD0, \xC7\xEE\xEE\xEB.\ \xE8\xED-\xF2",
-    editor = "\xC8. \xCC. \xC3\xF0\xEE\xEC\xEE\xE2\xE0 and \xC3. \xC8. \xC1\xE0\xF0\xE0\xED\xEE\xE2\xEE\xE9",
-    address   = "\xCB.",
-    publisher = "\xCD\xE0\xF3\xEA\xE0, \xCB\xE5\xED\xE8\xED\xE3.\ \xEE\xF2\xE4-\xED\xE8\xE5",
-    year = 1981,
-    pagetotal = 456,
-    language = "russian"
+  title        = {\xCA\xE0\xF2\xE0\xEB\xEE\xE3 \xEC\xEB\xE5\xEA\xEE\xEF\xE8\xF2\xE0\xFE\xF9\xE8\xF5 \xD1\xD1\xD1\xD0.
+                  \xCF\xEB\xE8\xEE\xF6\xE5\xED "--- \xF1\xEE\xE2\xF0\xE5\xEC\xE5\xED\xED\xEE\xF1\xF2\xFC},
+  organization = {\xC0\xCD \xD1\xD1\xD1\xD0, \xC7\xEE\xEE\xEB.\ \xE8\xED-\xF2},
+  editor       = {\xC8. \xCC. \xC3\xF0\xEE\xEC\xEE\xE2\xE0 and \xC3. \xC8. \xC1\xE0\xF0\xE0\xED\xEE\xE2\xEE\xE9},
+  address      = {\xCB.},
+  publisher    = {\xCD\xE0\xF3\xEA\xE0, \xCB\xE5\xED\xE8\xED\xE3.\ \xEE\xF2\xE4-\xED\xE8\xE5},
+  year         = {1981},
+  pagetotal    = {456},
+  language     = {russian},
 }
-
 @BOOK{Instr86,
-    title = "\xD2\xE8\xEF\xEE\xE2\xE0\xFF \xE8\xED\xF1\xF2\xF0\xF3\xEA\xF6\xE8\xFF \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8 
-      \xF2\xEE\xEF\xEB\xE8\xE2\xEE\xEE\xF2\xE4\xE0\xF7\xE8 \xF2\xE5\xEF\xEB\xEE\xE2\xFB\xF5 \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xF1\xF2\xE0\xED\xF6\xE8\xE9: 
-      \xD2\xC8 34-70-044-85: \xD3\xF2\xE2. \xC3\xEB. \xF2\xE5\xF5\xED. \xF3\xEF\xF0. 
-      \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8 \xFD\xED\xE5\xF0\xE3\xEE\xF1\xE8\xF1\xF2\xE5\xEC 01.10.85: 
-      \xD1\xF0\xEE\xEA \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED \xF1 01.01.86 \xE4\xEE 01.01.95",
-    organization = "\xCC-\xE2\xEE \xFD\xED\xE5\xF0\xE3\xE5\xF2\xE8\xEA\xE8 \xE8 \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8 \xD1\xD1\xD1\xD0",
-    address   = "\xCC.",
-    year = 1986,
-    pagetotal = 43,
-    language = "russian"
+  title        = {\xD2\xE8\xEF\xEE\xE2\xE0\xFF \xE8\xED\xF1\xF2\xF0\xF3\xEA\xF6\xE8\xFF \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8
+                  \xF2\xEE\xEF\xEB\xE8\xE2\xEE\xEE\xF2\xE4\xE0\xF7\xE8 \xF2\xE5\xEF\xEB\xEE\xE2\xFB\xF5 \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xF1\xF2\xE0\xED\xF6\xE8\xE9~:
+                  \xD2\xC8 34-70-044-85~: \xD3\xF2\xE2. \xC3\xEB. \xF2\xE5\xF5\xED. \xF3\xEF\xF0.
+                  \xEF\xEE \xFD\xEA\xF1\xEF\xEB\xF3\xE0\xF2\xE0\xF6\xE8\xE8 \xFD\xED\xE5\xF0\xE3\xEE\xF1\xE8\xF1\xF2\xE5\xEC 01.10.85~:
+                  \xD1\xF0\xEE\xEA \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED \xF1 01.01.86 \xE4\xEE 01.01.95},
+  organization = {\xCC-\xE2\xEE \xFD\xED\xE5\xF0\xE3\xE5\xF2\xE8\xEA\xE8 \xE8 \xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF4\xE8\xEA\xE0\xF6\xE8\xE8 \xD1\xD1\xD1\xD0},
+  address      = {\xCC.},
+  year         = {1986},
+  pagetotal    = {43},
+  language     = {russian},
 }
- at online{ wiki:latex,
-   author = "Wikipedia",
-   title = "{\LaTeX}---Wikipedia{,} The Free Encyclopedia",
-   year = "2012",
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}---Wikipedia{,} The Free Encyclopedia},
+  year         = {2012},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }
 
- at online{ wiki:latex-2,
-   author = "Wikipedia",
-   title = "{\LaTeX}",
-   howpublished = "Wikipedia, The Free Encyclopedia",
-   year = "2012",
-   eprint ="wiki/LaTeX",
-   eprinttype   = {WikiPedia},
-   url = "http://en.wikipedia.org/wiki/LaTeX",
-   urldate = "25.01.2012"
+ at ONLINE{wiki:latex-2,
+  author       = {Wikipedia},
+  title        = {{\LaTeX}},
+  howpublished = {Wikipedia, The Free Encyclopedia},
+  year         = {2012},
+  eprint       = {wiki/LaTeX},
+  eprinttype   = {WikiPedia},
+  url          = {http://en.wikipedia.org/wiki/LaTeX},
+  urldate      = {25.01.2012},
 }
- at online{ phys:moodle,
-  author = {\xD7\xE5\xF0\xEA\xE0\xF1\xF1\xEA\xE8\xE9, \xC2. \xD1.},
-  title = {\xCA\xEB\xE0\xF1\xF1\xED\xE0\xFF \xEA\xEE\xEC\xED\xE0\xF2\xE0},
-  howpublished = "\xD4\xE8\xE7\xE8\xF7\xE5\xF1\xEA\xE8\xE9 \xF4\xE0\xEA\xF3\xEB\xFC\xF2\xE5\xF2",
-  organization = "\xCD\xC3\xD3",
-  year = 2012,
-  url = {http://www.phys.nsu.ru/moodle/},
-  urldate = "16.01.2012",
-  language = "russian"
+ at ONLINE{phys:moodle,
+  author       = {\xD7\xE5\xF0\xEA\xE0\xF1\xF1\xEA\xE8\xE9, \xC2. \xD1.},
+  title        = {\xCA\xEB\xE0\xF1\xF1\xED\xE0\xFF \xEA\xEE\xEC\xED\xE0\xF2\xE0},
+  howpublished = {\xD4\xE8\xE7\xE8\xF7\xE5\xF1\xEA\xE8\xE9 \xF4\xE0\xEA\xF3\xEB\xFC\xF2\xE5\xF2},
+  organization = {\xCD\xC3\xD3},
+  year         = {2012},
+  url          = {http://www.phys.nsu.ru/moodle/},
+  urldate      = {16.01.2012},
+  language     = {russian},
 }
 @MISC{EXFOR,
   author       = {IAEA},
@@ -453,17 +463,17 @@
   url          = {http://www-nds.iaea.org/exfor},
   address      = {P.O. Box 100, Wagramer Strasse 5, A-1400 Vienna, Austria},
   year         = {2012},
-  medium       = {Electronic resource}
+  media        = {eresource}
 }
 @BOOK{IsaacNewton,
   author       = {Newton, {\relax Sir Isaac}},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   publisher    = {William Innys},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {eresource},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
@@ -470,95 +480,127 @@
 
 @BOOK{IsaacNewton-sl:sn,
   author       = {{\relax Sir I}saac Newton},
-  title        = {Opticks, or a treatise of the reflections, 
+  title        = {Opticks, or a treatise of the reflections,
                   refractions, inflections and colours of light},
   url          = {http://books.google.com/books?id=XXu4AkRVBBoC},
-  medium       = {Electronic resource},
+  media        = {online},
   year         = {1730},
-  pagetotal     = {382},
+  pagetotal    = {382},
   eprint       = {XXu4AkRVBBoC},
   eprinttype   = {Google Books},
 }
-%  publisher    = {William Innys},
- at article{PhysRevLett.101.085006,
-  author = {Kotelnikov, Igor and Rom\'e, Massimiliano},
-  volume = {101},
-  journal = {Phys. Rev. Lett.},
-  month = {Aug},
-  pagetotal = {4},
-  title = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
-  year = {2008},
-  doi = {10.1103/PhysRevLett.101.085006},
-  issue = {8},
-  publisher = {American Physical Society},
-  pages = {085006}
+%  publisher   = {William Innys},
+ at BOOK{Encyclopedia,
+  title        = {\xD5\xF3\xE4\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xE0\xFF \xFD\xED\xF6\xE8\xEA\xEB\xEE\xEF\xE5\xE4\xE8\xFF \xE7\xE0\xF0\xF3\xE1\xE5\xE6\xED\xEE\xE3\xEE \xEA\xEB\xE0\xF1\xF1\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xE8\xF1\xEA\xF3\xF1\xF1\xF2\xE2\xE0},
+  publisher    = {\xC1\xEE\xEB\xFC\xF8\xE0\xFF \xD0\xEE\xF1. \xFD\xED\xF6\xE8\xEA\xEB.},
+  year         = {1996},
+  address      = {\xCC.},
+  note         = {1 \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xED. \xEE\xEF\xF2. \xE4\xE8\xF1\xEA (CD-ROM)},
+  language     = {russian},
+  media        = {eresource},
 }
 
+ at ARTICLE{Nasirova,
+  title        = {\xCC\xEE\xE4\xE5\xEB\xE8 \xE3\xEE\xF1\xF3\xE4\xE0\xF0\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF0\xE5\xE3\xF3\xEB\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xF1\xF2\xF0\xE0\xF5\xEE\xE2\xEE\xE9 \xE4\xE5\xFF\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xE8},
+  author       = {\xCD\xE0\xF1\xFB\xF0\xEE\xE2\xE0, \xC3. \xC0.},
+  language     = {russian},
+  note         = {\xD0\xE5\xE6\xE8\xEC \xE4\xEE\xF1\xF2\xF3\xEF\xE0: http://vestnik.fa.ru/4(28)2003/4.html},
+  number       = {4},
+  year         = {2003},
+  journal      = {\xC2\xE5\xF1\xF2\xED\xE8\xEA \xD4\xE8\xED\xE0\xED\xF1\xEE\xE2\xEE\xE9 \xE0\xEA\xE0\xE4\xE5\xEC\xE8\xE8},
+  media2       = {eresource},
+  media        = {online},
+}
+
+ at BOOK{kremlincd,
+  title        = {\xCC\xEE\xF1\xEA\xEE\xE2\xF1\xEA\xE8\xE9 \xCA\xF0\xE5\xEC\xEB\xFC},
+  titleaddon   = {\xF2\xF0\xE5\xF5\xEC\xE5\xF0. \xEF\xF3\xF2\xE5\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC},
+  language     = {russian},
+  note         = {CD-ROM},
+  date         = {2007},
+  location     = {\xCC.},
+  publisher    = {\xCD\xEE\xE2\xFB\xE9 \xC4\xE8\xF1\xEA},
+  media        = {eresource},
+}
+ at ARTICLE{PhysRevLett.101.085006,
+  author       = {Kotelnikov, Igor and Rom\'e, Massimiliano},
+  volume       = {101},
+  journal      = {Phys. Rev. Lett.},
+  month        = {Aug},
+  pagetotal    = {4},
+  title        = {Admissible Equilibria of Non-neutral Plasmas in a Malmberg-Penning Trap},
+  year         = {2008},
+  doi          = {10.1103/PhysRevLett.101.085006},
+  issue        = {8},
+  publisher    = {American Physical Society},
+  pages        = {085006},
+}
+
 % url = {http://link.aps.org/doi/10.1103/PhysRevLett.101.085006},
 @ARTICLE{1998PhRvE..57.7111K,
-   author = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
-    title = "{Turbulent cascades in anisotropic magnetohydrodynamics}",
-  journal = pre,
- keywords = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
-     year = 1998,
-    month = jun,
-   volume = 57,
-    pages = {7111-7121},
-      doi = {10.1103/PhysRevE.57.7111},
-   adsurl = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
-  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+  author       = {{Kinney}, R.~M. and {McWilliams}, J.~C.},
+  title        = {{Turbulent cascades in anisotropic magnetohydrodynamics}},
+  journal      = pre,
+  keywords     = {Plasma turbulence, Magnetohydrodynamic and fluid equation},
+  year         = {1998},
+  month        = jun,
+  volume       = {57},
+  pages        = {7111-7121},
+  doi          = {10.1103/PhysRevE.57.7111},
+  adsurl       = {http://adsabs.harvard.edu/abs/1998PhRvE..57.7111K},
+  adsnote      = {Provided by the SAO/NASA Astrophysics Data System},
 }
 
 @ARTICLE{1998UFN,
-   author = {\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8. \xC0. and \xC0\xF1\xF2\xF0\xE5\xEB\xE8\xED, \xC2. \xD2.},
-    title = "\xD2\xE5\xEE\xF0\xE8\xFF \xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xEE\xE3\xEE \xFD\xEC\xE8\xF2\xF2\xE5\xF0\xE0 \xEF\xEE\xEB\xEE\xE6\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xEE\xED\xEE\xE2",
-  journal = ufn,
- keywords = {\xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xFB\xE9 \xFD\xEC\xE8\xF2\xF2\xE5\xF0, \xEA\xF0\xE8\xF2\xE5\xF0\xE8\xE9 \xC1\xEE\xEC\xE0},
-     year = 2015,
-    month = jul,
-   volume = 185,
-    pages = {753-771},
- language = {russian},
-      doi = {10.3367/UFNr.0185.201507c.0753},
-      url = {http://ufn.ru/ru/articles/2015/7/c/},
+  author       = {\xCA\xEE\xF2\xE5\xEB\xFC\xED\xE8\xEA\xEE\xE2, \xC8. \xC0. and \xC0\xF1\xF2\xF0\xE5\xEB\xE8\xED, \xC2. \xD2.},
+  title        = {\xD2\xE5\xEE\xF0\xE8\xFF \xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xEE\xE3\xEE \xFD\xEC\xE8\xF2\xF2\xE5\xF0\xE0 \xEF\xEE\xEB\xEE\xE6\xE8\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xE8\xEE\xED\xEE\xE2},
+  journal      = ufn,
+  keywords     = {\xEF\xEB\xE0\xE7\xEC\xE5\xED\xED\xFB\xE9 \xFD\xEC\xE8\xF2\xF2\xE5\xF0, \xEA\xF0\xE8\xF2\xE5\xF0\xE8\xE9 \xC1\xEE\xEC\xE0},
+  year         = {2015},
+  month        = jul,
+  volume       = {185},
+  pages        = {753-771},
+  language     = {russian},
+  doi          = {10.3367/UFNr.0185.201507c.0753},
+  url          = {http://ufn.ru/ru/articles/2015/7/c/},
 }
 @PATENT{patent1,
-  	author          = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+  	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.},
+  	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       = {text},
+  	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},
+  	requestdate = {07.04.2000},
   	publicationdate = {10.03.2001},
-  	publication     = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
-  	prioritydate    = {09.04.1999},
+  	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},
+  pagetotal    = {5 \xF1.~: \xE8\xEB.},
+  	language    = {russian},
 }
 
 @PATENT{patent2,
-  	author          = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+  	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.},
+  	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       = {text},
+  	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},
+  	date        = {18.12.2000},
   	publicationdate = {20.08.2002},
-  	publication     = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
-    pagetotal       = {2 \xF1.~: \xE8\xEB.},
-  	language        = {russian},
+  	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/gost.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -4,8 +4,38 @@
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[russian]{babel}
-\usepackage{bibunits,verbatim,bibnocap,geometry,ifpdf}
-%\usepackage{cmap}
+\usepackage{bibunits,verbatim,geometry,ifpdf}
+
+%============================================================
+\makeatletter
+\RequirePackage{bibunits}
+\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt}
+\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0}
+\def\@biblabel#1{#1.\hfill}
+%\endinput
+\renewenvironment{thebibliography}[1]
+      {\list{\@biblabel{\@arabic\c at enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{99}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+%            \advance\leftmargin\parindent
+            \setcounter{qnuma}{\c at enumiv}
+            \@openbib at code
+            \usecounter{enumiv}%
+            \let\p at enumiv\@empty
+            \setcounter{enumiv}{\theqnuma}
+            \renewcommand\theenumiv{\@arabic\c at enumiv}}%
+      \sloppy
+      \clubpenalty4000
+      \@clubpenalty \clubpenalty
+      \widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex at warning{Empty `thebibliography' environment}}%
+      \endlist}
+\makeatother
+%============================================================
+
 \ifpdf
   \usepackage[pdftex,hyperindex,unicode]{hyperref}
 \else
@@ -49,80 +79,117 @@
 \bibliographystyle{\mybibstyle}
 
 \section{Books}
+
 \subsection{One--three authors}
 \bibentry{ex01}
 \bibentry{ex02}
 \bibentry{ex03}
+
 \subsection{Four and more authors}
 \bibentry{ex04}
 \bibentry{ex05}
+
 \subsection{Collective author}
 \bibentry{ex06}
+
 \subsection{Compiler}
 \bibentry{ex06a}
-\subsection{Multiple-volume publication}
+
+\subsection{Multiple-volume publications}
 \bibentry{ex07}
 \bibentry{ex08}
 \bibentry{ex09}
+
 \subsection{Translated}
 \bibentry{ex10}
+
 \subsection{Collections}
 \bibentry{ex12}
+
 \subsection{Dictionary}
 \bibentry{ex13}
-\section{Parts of}
+
+
+\section{Parts of \ldots}
+
 \subsection{Book}
 \bibentry{ex14}
 \bibentry{ex14a}
+
 \subsection{Collection}
 \bibentry{ex15}
+
 \subsection{Journal}
 \bibentry{ex16}
 \bibentry{ex17}
 \bibentry{ex17a}
+
 \subsection{Newspaper}
 \bibentry{ex17b}
-\subsection{Encyclop\ae dia}
+
+\subsection{Encyclopedia}
 \bibentry{ex18}
+
 \subsection{Proceedings}
 \bibentry{ex19}
 \bibentry{ex20}
+
 \subsubsection{With crossreference}
 \bibentry{ex20a}
+
 \subsubsection{With multiple languages}
 \bibentry{ex20b}
-\section{Other}
+
+
+\section{Others}
+
 \subsection{Standard}
 \bibentry{ex11}
-\subsection{Ph.D. Thesis / Dissertation}
+
+\subsection{Dissertation}
 \bibentry{ex21}
 \bibentry{ex21a}
-\subsection{Synopsis}
+\bibentry{ex21b}
+Allowed built-in values of \verb|type| field in \verb|@THESIS| entry are \verb|mathesis| for masters thesis, \verb|phdthesis| for Ph.D. thesis, and \verb|docthesis| for doctor of sciences dissertation. Any other value of \verb|type| is reproduced literally.
 \bibentry{ex22}
+\bibentry{ex22a}
+
 \subsection{Preprint}
 \bibentry{ex23}
+
 \subsection{Report}
 \bibentry{ex24}
 \bibentry{ex24a}
 \bibentry{ex24b}
+
 \subsection{Catalog}
 \bibentry{ex25}
+
 \subsection{Instruction}
 \bibentry{ex26}
-\section{Electronic Publishing}
+
+\subsection{Patent}
+\bibentry{ex31}
+
+
+\section{Electronic resources}
+
 \subsection{Common Fields}
-\verb|Url|, \verb|eprint|, \verb|doi| and \verb|medium| fields can be assigned to any entry.
+\verb|Url|, \verb|eprint|, \verb|doi| and \verb|media| fields can be assigned to any entry. Allowed values of \verb|media| are \verb|online|, \verb|eresource| and \verb|text| (default).
 \bibentry{ex27c}
 \bibentry{ex28}
+\bibentry{ex28a}
 \bibentry{ex29}
+
 \subsection{Online Entry}
 \bibentry{ex27a}
 \bibentry{ex27b}
+
 \section{Use of macros}
-\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field 
+
+\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field
 are automatically translated to Russian or English if necessary. Other languages are not supported.
 \bibentry{ex30}
-\section{Patents}
-\bibentry{ex31}
 
+
 \end{document} 
\ No newline at end of file

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)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib-s.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,122 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-\newcommand*{\mybibstyle}{gost2008ns}
-
-\RequirePackage[cp1251]{inputenc}
-
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
-   and \texttt{natbib} package.
-   No customization is applied.
-
-   \xCF\xF0\xE8\xEC\xE5\xF0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xF2\xE8\xEB\xFF 
-   \texttt{\mybibstyle.bst} \xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \texttt{natbib}.
-   \xCA\xEE\xEC\xE0\xED\xE4\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xFB.
-}
-
-\documentclass[a4paper]{article}
-\usepackage[cp1251]{inputenc}
-\usepackage[T2A]{fontenc}
-\usepackage[ukrainian,russian]{babel}
-\usepackage{natbib}
-\usepackage{geometry,ifpdf}
-\ifpdf
-  \usepackage[pdftex,hyperindex,unicode]{hyperref}
-  \usepackage{cmap}
-\else
-  \usepackage[hypertex]{hyperref}
-\fi
-\usepackage{color}
-\definecolor{darkblue}{rgb}{0,0,.6}
-\hypersetup{
-  pdftitle           = {\mytitle},
-  pdfauthor          = {Igor A. Kotelnikov},
-  pdfsubject         = {GOST, BibTeX},
-  pdfstartview       = {FitH},
-%  pdfborder          = {0 0 0},
-%  bookmarksopen      = true,
-  bookmarksnumbered  = true,
-%  bookmarksopenlevel = 2,
-  colorlinks = true,     linkcolor  = darkblue,
-  citecolor  = darkblue, filecolor  = darkblue,
-  menucolor  = darkblue, urlcolor   = darkblue
-}
-
-\makeatletter
-\renewcommand{\@biblabel}[1]{#1.}
-\makeatother		
-		
-\begin{document}
-
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
-%\verb|\cite{*}| \cite{*}
-%
-%\verb|\citep{*}| \citep{*}
-%
-%\verb|\citet{*}| \citet{*}
-
-\newcommand{\allrefs}{Vasylenko92,
-Afanasyev92,
-Makilov91,
-Ponomarenko86,
-Belousova81,
-BibOp91,
-Poems82,
-HistLit82,
-Landau:eldin,
-BRLS94,
-Grosse80,
-GOST7184,
-ObchTech93,
-Bibdelo86,
-Ponomarenko79,
-Zeyts70,
-Ponoomarenko76,
-Malikov92,
-Ponomarenko86a,
-dixit.pindyck:options,
-RosGaz-article,
-Dolmatovskiy88,
-Ponomarenko88,
-Melikov95, Selikov95, Selikov+95,
-Gojchuk98,
-Polyakov98a,
-TranskSpivrob99:Purich,
-Luus82,
-KIA95-default,
-KIA85-autoref,
-Ponomarenko76,
-Report81-rep,
-Report81b-rep-notype,
-Report81-techrep,
-CatalogMamals81,
-Instr86,
-wiki:latex,
-wiki:latex-2,
-phys:moodle,
-EXFOR,
-IsaacNewton,
-IsaacNewton-sl:sn,
-PhysRevLett.101.085006}
-
-
-\verb|\citep|\par \citep{\allrefs}
-
-\verb|\citep*|\par \citep{\allrefs}
-
-\verb|\citeauthor|\par \citeauthor{\allrefs}
-
-\verb|\citeauthor*|\par \citeauthor*{\allrefs}
-
-
-\bibliographystyle{\mybibstyle}  
-\bibliography{bib/examples}     
-
-\end{document} 
-
-

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-natbib.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,118 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-\newcommand*{\mybibstyle}{gost2008n}
-
-\RequirePackage[cp1251]{inputenc}
-
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
-   and \texttt{natbib} package.
-   No customization is applied.
-
-   \xCF\xF0\xE8\xEC\xE5\xF0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xF2\xE8\xEB\xFF 
-   \texttt{\mybibstyle.bst} \xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \texttt{natbib}.
-   \xCA\xEE\xEC\xE0\xED\xE4\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xFB.
-}
-
-\documentclass[a4paper]{article}
-\usepackage[cp1251]{inputenc}
-\usepackage[T2A]{fontenc}
-\usepackage[ukrainian,russian]{babel}
-\usepackage{natbib}
-\usepackage{geometry,ifpdf}
-\ifpdf
-  \usepackage[pdftex,hyperindex,unicode]{hyperref}
-  \usepackage{cmap}
-\else
-  \usepackage[hypertex]{hyperref}
-\fi
-\usepackage{color}
-\definecolor{darkblue}{rgb}{0,0,.6}
-\hypersetup{
-  pdftitle           = {\mytitle},
-  pdfauthor          = {Igor A. Kotelnikov},
-  pdfsubject         = {GOST, BibTeX},
-  pdfstartview       = {FitH},
-%  pdfborder          = {0 0 0},
-%  bookmarksopen      = true,
-  bookmarksnumbered  = true,
-%  bookmarksopenlevel = 2,
-  colorlinks = true,     linkcolor  = darkblue,
-  citecolor  = darkblue, filecolor  = darkblue,
-  menucolor  = darkblue, urlcolor   = darkblue
-}
-
-\makeatletter
-\renewcommand{\@biblabel}[1]{#1.}
-\makeatother		
-		
-\begin{document}
-
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
-\newcommand{\allrefs}{Vasylenko92,
-Afanasyev92,
-Makilov91,
-Ponomarenko86,
-Belousova81,
-BibOp91,
-Poems82,
-HistLit82,
-Landau:eldin,
-BRLS94,
-Grosse80,
-GOST7184,
-ObchTech93,
-Bibdelo86,
-Ponomarenko79,
-Zeyts70,
-Ponoomarenko76,
-Malikov92,
-Ponomarenko86a,
-dixit.pindyck:options,
-RosGaz-article,
-Dolmatovskiy88,
-Ponomarenko88,
-Melikov95, Selikov95, Selikov+95,
-Gojchuk98,
-Polyakov98a,
-TranskSpivrob99:Purich,
-Luus82,
-KIA95-default,
-KIA85-autoref,
-Ponomarenko76,
-Report81-rep,
-Report81b-rep-notype,
-Report81-techrep,
-CatalogMamals81,
-Instr86,
-wiki:latex,
-wiki:latex-2,
-phys:moodle,
-EXFOR,
-IsaacNewton,
-IsaacNewton-sl:sn,
-PhysRevLett.101.085006}
-
-
-\verb|\cite|\par \cite{\allrefs}
-
-\verb|\citep|\par \citep{\allrefs}
-
-\verb|\citep*|\par \citep{\allrefs}
-
-\verb|\citeauthor|\par \citeauthor{\allrefs}
-
-\verb|\citeauthor*|\par \citeauthor*{\allrefs}
-
-
-\bibliographystyle{\mybibstyle}  
-\bibliography{bib/examples}     
-
-\end{document} 
-
-

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008-sorted.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,106 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-\newcommand*{\mybibstyle}{gost2008s}
-
-\RequirePackage[cp1251]{inputenc}
-
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst}. 
-   No customization is applied.
-
-   \xCF\xF0\xE8\xEC\xE5\xF0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xF2\xE8\xEB\xFF 
-   \texttt{\mybibstyle.bst}.
-   \xCA\xEE\xEC\xE0\xED\xE4\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xFB.
-}
-
-\documentclass[a4paper]{article}
-\usepackage[cp1251]{inputenc}
-\usepackage[T2A]{fontenc}
-\usepackage[ukrainian,russian]{babel}
-%\usepackage{natbib}
-\usepackage{geometry,ifpdf}
-\ifpdf
-  \usepackage[pdftex,hyperindex,unicode]{hyperref}
-  \usepackage{cmap}
-\else
-  \usepackage[hypertex]{hyperref}
-\fi
-\usepackage{color}
-\definecolor{darkblue}{rgb}{0,0,.6}
-\hypersetup{
-  pdftitle           = {\mytitle},
-  pdfauthor          = {Igor A. Kotelnikov},
-  pdfsubject         = {GOST, BibTeX},
-  pdfstartview       = {FitH},
-%  pdfborder          = {0 0 0},
-%  bookmarksopen      = true,
-  bookmarksnumbered  = true,
-%  bookmarksopenlevel = 2,
-  colorlinks = true,     linkcolor  = darkblue,
-  citecolor  = darkblue, filecolor  = darkblue,
-  menucolor  = darkblue, urlcolor   = darkblue
-}
-
-\makeatletter
-\renewcommand{\@biblabel}[1]{#1.}
-\makeatother		
-		
-\begin{document}
-
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
-\newcommand{\allrefs}{Vasylenko92,
-Afanasyev92,
-Makilov91,
-Ponomarenko86,
-Belousova81,
-BibOp91,
-Poems82,
-HistLit82,
-Landau:eldin,
-BRLS94,
-Grosse80,
-GOST7184,
-ObchTech93,
-Bibdelo86,
-Ponomarenko79,
-Zeyts70,
-Ponoomarenko76,
-Malikov92,
-Ponomarenko86a,
-dixit.pindyck:options,
-RosGaz-article,
-Dolmatovskiy88,
-Ponomarenko88,
-Melikov95,
-Gojchuk98,
-Polyakov98a,
-TranskSpivrob99:Purich,
-Luus82,
-KIA95-default,
-KIA85-autoref,
-Ponomarenko76,
-Report81-rep,
-Report81b-rep-notype,
-Report81-techrep,
-CatalogMamals81,
-Instr86,
-wiki:latex,
-wiki:latex-2,
-phys:moodle,
-EXFOR,
-IsaacNewton,
-IsaacNewton-sl:sn,
-PhysRevLett.101.085006}
-
-\nocite{*}
-\cite{\allrefs}
-
-\bibliographystyle{\mybibstyle}  
-\bibliography{bib/examples}     
-
-\end{document} 

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008l.pdf
===================================================================
(Binary files differ)

Added: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf	2017-01-16 23:13:28 UTC (rev 42974)

Property changes on: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008n.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,118 @@
+% !Mode:: "TeX:UTF-8"
+\newcommand*{\mybibstyle}{gost2008n}
+
+\RequirePackage[cp1251]{inputenc}
+
+\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
+\newcommand{\mydescription}{
+   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
+   and \texttt{natbib} package.
+   No customization is applied.
+
+   \xCF\xF0\xE8\xEC\xE5\xF0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xF2\xE8\xEB\xFF 
+   \texttt{\mybibstyle.bst} \xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \texttt{natbib}.
+   \xCA\xEE\xEC\xE0\xED\xE4\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xFB.
+}
+
+\documentclass[a4paper]{article}
+\usepackage[cp1251]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[ukrainian,russian]{babel}
+\usepackage{natbib}
+\usepackage{geometry,ifpdf}
+\ifpdf
+  \usepackage[pdftex,hyperindex,unicode]{hyperref}
+  \usepackage{cmap}
+\else
+  \usepackage[hypertex]{hyperref}
+\fi
+\usepackage{color}
+\definecolor{darkblue}{rgb}{0,0,.6}
+\hypersetup{
+  pdftitle           = {\mytitle},
+  pdfauthor          = {Igor A. Kotelnikov},
+  pdfsubject         = {GOST, BibTeX},
+  pdfstartview       = {FitH},
+%  pdfborder          = {0 0 0},
+%  bookmarksopen      = true,
+  bookmarksnumbered  = true,
+%  bookmarksopenlevel = 2,
+  colorlinks = true,     linkcolor  = darkblue,
+  citecolor  = darkblue, filecolor  = darkblue,
+  menucolor  = darkblue, urlcolor   = darkblue
+}
+
+\makeatletter
+\renewcommand{\@biblabel}[1]{#1.}
+\makeatother		
+		
+\begin{document}
+
+\title{\mytitle}
+\maketitle
+\begin{abstract}
+  \mydescription
+\end{abstract}
+
+\newcommand{\allrefs}{Vasylenko92,
+Afanasyev92,
+Makilov91,
+Ponomarenko86,
+Belousova81,
+BibOp91,
+Poems82,
+HistLit82,
+Landau:eldin,
+BRLS94,
+Grosse80,
+GOST7184,
+ObchTech93,
+Bibdelo86,
+Ponomarenko79,
+Zeyts70,
+Ponoomarenko76,
+Malikov92,
+Ponomarenko86a,
+dixit.pindyck:options,
+RosGaz-article,
+Dolmatovskiy88,
+Ponomarenko88,
+Melikov95, Selikov95, Selikov+95,
+Gojchuk98,
+Polyakov98a,
+TranskSpivrob99:Purich,
+Luus82,
+KIA95-default,
+KIA85-autoref,
+Ponomarenko76,
+Report81-rep,
+Report81b-rep-notype,
+Report81-techrep,
+CatalogMamals81,
+Instr86,
+wiki:latex,
+wiki:latex-2,
+phys:moodle,
+EXFOR,
+IsaacNewton,
+IsaacNewton-sl:sn,
+PhysRevLett.101.085006}
+
+
+\verb|\cite|\par \cite{\allrefs}
+
+\verb|\citep|\par \citep{\allrefs}
+
+\verb|\citep*|\par \citep{\allrefs}
+
+\verb|\citeauthor|\par \citeauthor{\allrefs}
+
+\verb|\citeauthor*|\par \citeauthor*{\allrefs}
+
+
+\bibliographystyle{\mybibstyle}  
+\bibliography{bib/examples}     
+
+\end{document} 
+
+

Added: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf	2017-01-16 23:13:28 UTC (rev 42974)

Property changes on: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/gost2008ns.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,122 @@
+% !Mode:: "TeX:UTF-8"
+\newcommand*{\mybibstyle}{gost2008ns}
+
+\RequirePackage[cp1251]{inputenc}
+
+\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
+\newcommand{\mydescription}{
+   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
+   and \texttt{natbib} package.
+   No customization is applied.
+
+   \xCF\xF0\xE8\xEC\xE5\xF0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xF2\xE8\xEB\xFF 
+   \texttt{\mybibstyle.bst} \xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \texttt{natbib}.
+   \xCA\xEE\xEC\xE0\xED\xE4\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xFB.
+}
+
+\documentclass[a4paper]{article}
+\usepackage[cp1251]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[ukrainian,russian]{babel}
+\usepackage{natbib}
+\usepackage{geometry,ifpdf}
+\ifpdf
+  \usepackage[pdftex,hyperindex,unicode]{hyperref}
+  \usepackage{cmap}
+\else
+  \usepackage[hypertex]{hyperref}
+\fi
+\usepackage{color}
+\definecolor{darkblue}{rgb}{0,0,.6}
+\hypersetup{
+  pdftitle           = {\mytitle},
+  pdfauthor          = {Igor A. Kotelnikov},
+  pdfsubject         = {GOST, BibTeX},
+  pdfstartview       = {FitH},
+%  pdfborder          = {0 0 0},
+%  bookmarksopen      = true,
+  bookmarksnumbered  = true,
+%  bookmarksopenlevel = 2,
+  colorlinks = true,     linkcolor  = darkblue,
+  citecolor  = darkblue, filecolor  = darkblue,
+  menucolor  = darkblue, urlcolor   = darkblue
+}
+
+\makeatletter
+\renewcommand{\@biblabel}[1]{#1.}
+\makeatother		
+		
+\begin{document}
+
+\title{\mytitle}
+\maketitle
+\begin{abstract}
+  \mydescription
+\end{abstract}
+
+%\verb|\cite{*}| \cite{*}
+%
+%\verb|\citep{*}| \citep{*}
+%
+%\verb|\citet{*}| \citet{*}
+
+\newcommand{\allrefs}{Vasylenko92,
+Afanasyev92,
+Makilov91,
+Ponomarenko86,
+Belousova81,
+BibOp91,
+Poems82,
+HistLit82,
+Landau:eldin,
+BRLS94,
+Grosse80,
+GOST7184,
+ObchTech93,
+Bibdelo86,
+Ponomarenko79,
+Zeyts70,
+Ponoomarenko76,
+Malikov92,
+Ponomarenko86a,
+dixit.pindyck:options,
+RosGaz-article,
+Dolmatovskiy88,
+Ponomarenko88,
+Melikov95, Selikov95, Selikov+95,
+Gojchuk98,
+Polyakov98a,
+TranskSpivrob99:Purich,
+Luus82,
+KIA95-default,
+KIA85-autoref,
+Ponomarenko76,
+Report81-rep,
+Report81b-rep-notype,
+Report81-techrep,
+CatalogMamals81,
+Instr86,
+wiki:latex,
+wiki:latex-2,
+phys:moodle,
+EXFOR,
+IsaacNewton,
+IsaacNewton-sl:sn,
+PhysRevLett.101.085006}
+
+
+\verb|\citep|\par \citep{\allrefs}
+
+\verb|\citep*|\par \citep{\allrefs}
+
+\verb|\citeauthor|\par \citeauthor{\allrefs}
+
+\verb|\citeauthor*|\par \citeauthor*{\allrefs}
+
+
+\bibliographystyle{\mybibstyle}  
+\bibliography{bib/examples}     
+
+\end{document} 
+
+

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/gost780.pdf
===================================================================
(Binary files differ)

Added: trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-cp1251.cmd	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,34 @@
+ at echo \x8F\xAE\xA4\xA3\xAE⮢\xAA\xA0 䠩\xAB\xAE\xA2 \xAFਬ\xA5஢ 
+ at echo ==========================
+
+ at echo \x8F\xA5२\xAC\xA5\xAD\xAE\xA2\xA0\xAD\xA8\xA5 \xAF।\xEB\xA4\xE3饣\xAE \xAE\xA1饣\xAE 䠩\xAB\xA0
+
+rename .\bib\examples.bib examples.bak
+
+ at echo \x8A\xAE\xAF\xA8஢\xA0\xAD\xA8\xA5 \xAC\xA0\xE1\xE1\xEB \xAC\xA0\xAB\xA5\xAD쪨\xE5 䠩\xAB\xAE\xA2 \xA2 \xAE\xA4\xA8\xAD \xA1\xAE\xAB\xEC让
+
+copy .\bib\ex*.bib .\bib\examples.bib
+
+ at echo \x96\xA8\xAA\xAB\xA8\xE7\xA5᪠\xEF \xA3\xA5\xAD\xA5\xE0\xA0\xE6\xA8\xEF \xAFਬ\xA5஢
+
+for %%f in (gost7*.tex) do pdflatex -quiet %%f 
+for %%f in (gost200*.tex) do pdflatex -quiet %%f 
+
+ at echo \x96\xA8\xAA\xAB\xA8\xE7\xA5᪠\xEF \xAE\xA1ࠡ\xAE⪠ bibtex8 *.aux, \xA1\xA5\xA7 \xED⮣\xAE '\xE7㤠 \xAD\xA5 \xA1㤥\xE2'
+
+for %%f in (gost*.aux) do bibtex8 -B -c cp1251.csf %%f 
+
+ at echo \x96\xA8\xAA\xAB\xA8\xE7\xA5᪠\xEF \xA3\xA5\xAD\xA5\xE0\xA0\xE6\xA8\xEF \xAFਬ\xA5஢ (\xA7\xA0室 \xAF\xAE᫥ bibtex8)
+
+for %%f in (gost7*.tex) do pdflatex %%f 
+for %%f in (gost200*.tex) do pdflatex %%f 
+for %%f in (gost2008-nat*.tex) do pdflatex %%f 
+for %%f in (gost2008-sort*.tex) do pdflatex %%f 
+
+ at echo \x97\xA8\xE1⪠ \xAF\xA0\xAF\xAA\xA8 \xAE\xE2 \xAD\xA5\xAD㦭\xEB\xE5 䠩\xAB\xAE\xA2
+
+ at del *.aux *.out *.toc *.brf .pdf
+ at del *.bbl 
+ at del *.blg 
+ at del *.log
+ at echo =======

Added: trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/make-examples-on-win-utf8.cmd	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,34 @@
+ at echo \x8F\xAE\xA4\xA3\xAE⮢\xAA\xA0 䠩\xAB\xAE\xA2 \xAFਬ\xA5஢ 
+ at echo ==========================
+
+ at echo \x8F\xA5२\xAC\xA5\xAD\xAE\xA2\xA0\xAD\xA8\xA5 \xAF।\xEB\xA4\xE3饣\xAE \xAE\xA1饣\xAE 䠩\xAB\xA0
+
+rename .\bib\examples.bib examples.bak
+
+ at echo \x8A\xAE\xAF\xA8஢\xA0\xAD\xA8\xA5 \xAC\xA0\xE1\xE1\xEB \xAC\xA0\xAB\xA5\xAD쪨\xE5 䠩\xAB\xAE\xA2 \xA2 \xAE\xA4\xA8\xAD \xA1\xAE\xAB\xEC让
+
+copy .\bib\ex*.bib .\bib\examples.bib
+
+ at echo \x96\xA8\xAA\xAB\xA8\xE7\xA5᪠\xEF \xA3\xA5\xAD\xA5\xE0\xA0\xE6\xA8\xEF \xAFਬ\xA5஢
+
+for %%f in (ugost7*.tex) do pdflatex -quiet %%f 
+for %%f in (ugost200*.tex) do pdflatex -quiet %%f 
+
+ at echo \x96\xA8\xAA\xAB\xA8\xE7\xA5᪠\xEF \xAE\xA1ࠡ\xAE⪠ bibtex8 *.aux, \xA1\xA5\xA7 \xED⮣\xAE '\xE7㤠 \xAD\xA5 \xA1㤥\xE2'
+
+for %%f in (ugost*.aux) do bibtex8 -B -c utf8cyrillic.csf %%f 
+
+ at echo \x96\xA8\xAA\xAB\xA8\xE7\xA5᪠\xEF \xA3\xA5\xAD\xA5\xE0\xA0\xE6\xA8\xEF \xAFਬ\xA5஢ (\xA7\xA0室 \xAF\xAE᫥ bibtex8)
+
+for %%f in (ugost7*.tex) do pdflatex %%f 
+for %%f in (ugost200*.tex) do pdflatex %%f 
+for %%f in (ugost2008-nat*.tex) do pdflatex %%f 
+for %%f in (ugost2008-sort*.tex) do pdflatex %%f 
+
+ at echo \x97\xA8\xE1⪠ \xAF\xA0\xAF\xAA\xA8 \xAE\xE2 \xAD\xA5\xAD㦭\xEB\xE5 䠩\xAB\xAE\xA2
+
+ at del *.aux *.out *.toc *.brf .pdf
+ at del *.bbl 
+ at del *.blg 
+ at del *.log
+ at echo =======

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -2,7 +2,38 @@
 \usepackage[T2A]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[russian]{babel}
-\usepackage{bibunits,verbatim,bibnocap,geometry,ifpdf}
+\usepackage{bibunits,verbatim,geometry,ifpdf}
+
+%============================================================
+\makeatletter
+\RequirePackage{bibunits}
+\renewcommand{\@bibunitname}{\jobname-\the\@bibunitauxcnt}
+\newcounter{qnum}\newcounter{qnuma}\setcounter{qnum}{0}
+\def\@biblabel#1{#1.\hfill}
+%\endinput
+\renewenvironment{thebibliography}[1]
+      {\list{\@biblabel{\@arabic\c at enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{99}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+%            \advance\leftmargin\parindent
+            \setcounter{qnuma}{\c at enumiv}
+            \@openbib at code
+            \usecounter{enumiv}%
+            \let\p at enumiv\@empty
+            \setcounter{enumiv}{\theqnuma}
+            \renewcommand\theenumiv{\@arabic\c at enumiv}}%
+      \sloppy
+      \clubpenalty4000
+      \@clubpenalty \clubpenalty
+      \widowpenalty4000%
+      \sfcode`\.\@m}
+     {\def\@noitemerr
+       {\@latex at warning{Empty `thebibliography' environment}}%
+      \endlist}
+\makeatother
+%============================================================
+
 \ifpdf
   \usepackage[pdftex,hyperindex,unicode]{hyperref}
   \usepackage{cmap}
@@ -37,90 +68,127 @@
 \end{bibunit}
 }
 
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
+%\title{\mytitle}
+%\maketitle
+%\begin{abstract}
+%  \mydescription
+%\end{abstract}
+%
 \bibliographyunit[\section]
 \bibliographystyle{\mybibstyle}
 
 \section{Books}
+
 \subsection{One--three authors}
 \bibentry{ex01}
 \bibentry{ex02}
 \bibentry{ex03}
+
 \subsection{Four and more authors}
 \bibentry{ex04}
 \bibentry{ex05}
+
 \subsection{Collective author}
 \bibentry{ex06}
+
 \subsection{Compiler}
 \bibentry{ex06a}
-\subsection{Multiple-volume publication}
+
+\subsection{Multiple-volume publications}
 \bibentry{ex07}
 \bibentry{ex08}
 \bibentry{ex09}
+
 \subsection{Translated}
 \bibentry{ex10}
+
 \subsection{Collections}
 \bibentry{ex12}
+
 \subsection{Dictionary}
 \bibentry{ex13}
-\section{Parts of}
+
+
+\section{Parts of \ldots}
+
 \subsection{Book}
 \bibentry{ex14}
 \bibentry{ex14a}
+
 \subsection{Collection}
 \bibentry{ex15}
+
 \subsection{Journal}
 \bibentry{ex16}
 \bibentry{ex17}
 \bibentry{ex17a}
+
 \subsection{Newspaper}
 \bibentry{ex17b}
-\subsection{Encyclop\ae dia}
+
+\subsection{Encyclopedia}
 \bibentry{ex18}
+
 \subsection{Proceedings}
 \bibentry{ex19}
 \bibentry{ex20}
+
 \subsubsection{With crossreference}
 \bibentry{ex20a}
+
 \subsubsection{With multiple languages}
 \bibentry{ex20b}
-\section{Other}
+
+
+\section{Others}
+
 \subsection{Standard}
 \bibentry{ex11}
-\subsection{Ph.D. Thesis / Dissertation}
+
+\subsection{Dissertation}
 \bibentry{ex21}
 \bibentry{ex21a}
-\subsection{Synopsis}
+\bibentry{ex21b}
+Allowed built-in values of \verb|type| field in \verb|@THESIS| entry are \verb|mathesis| for masters thesis, \verb|phdthesis| for Ph.D. thesis, and \verb|docthesis| for doctor of sciences dissertation. Any other value of \verb|type| is reproduced literally.
 \bibentry{ex22}
+\bibentry{ex22a}
+
 \subsection{Preprint}
 \bibentry{ex23}
+
 \subsection{Report}
 \bibentry{ex24}
 \bibentry{ex24a}
 \bibentry{ex24b}
+
 \subsection{Catalog}
 \bibentry{ex25}
+
 \subsection{Instruction}
 \bibentry{ex26}
-\section{Electronic Publishing}
+
+\subsection{Patent}
+\bibentry{ex31}
+
+
+\section{Electronic resources}
+
 \subsection{Common Fields}
-\verb|Url|, \verb|eprint|, \verb|doi| and \verb|medium| fields can be assigned to any entry.
+\verb|Url|, \verb|eprint|, \verb|doi| and \verb|media| fields can be assigned to any entry. Allowed values of \verb|media| are \verb|online|, \verb|eresource| and \verb|text| (default).
 \bibentry{ex27c}
 \bibentry{ex28}
+\bibentry{ex28a}
 \bibentry{ex29}
+
 \subsection{Online Entry}
 \bibentry{ex27a}
 \bibentry{ex27b}
+
 \section{Use of macros}
-\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field 
+
+\texttt{jan}, \texttt{feb}, \texttt{mar},\ldots{} \texttt{dec} macros in \texttt{month} field
 are automatically translated to Russian or English if necessary. Other languages are not supported.
 \bibentry{ex30}
-\section{Patents}
-\bibentry{ex31}
 
+
 \end{document} 
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2003.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,5 +1,6 @@
 \edef\mybibstyle{ugost2003}
 \RequirePackage[utf8]{inputenc}
+\RequirePackage{cmap}
 \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
 \newcommand{\mydescription}{
    Example bibliographic description using the style \texttt{\mybibstyle.bst}.

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-natbib.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,121 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-\newcommand*{\mybibstyle}{ugost2008n}
-
-\RequirePackage[utf8]{inputenc}
-
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
-   and \texttt{natbib} package.
-   No customization is applied.
-
-   Пример оформления списка литературы с помощью стиля 
-   \texttt{\mybibstyle.bst} и пакета \texttt{natbib}.
-   Команды форматирования не изменены.
-}
-
-\documentclass[a4paper]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T2A]{fontenc}
-\usepackage[ukrainian,russian]{babel}
-\usepackage{natbib}
-\usepackage{geometry,ifpdf}
-\ifpdf
-  \usepackage[pdftex,hyperindex,unicode]{hyperref}
-  \usepackage{cmap}
-\else
-  \usepackage[hypertex]{hyperref}
-\fi
-\usepackage{color}
-\definecolor{darkblue}{rgb}{0,0,.6}
-\hypersetup{
-  pdftitle           = {\mytitle},
-  pdfauthor          = {Igor A. Kotelnikov},
-  pdfsubject         = {GOST, BibTeX},
-  pdfstartview       = {FitH},
-%  pdfborder          = {0 0 0},
-%  bookmarksopen      = true,
-  bookmarksnumbered  = true,
-%  bookmarksopenlevel = 2,
-  colorlinks = true,     linkcolor  = darkblue,
-  citecolor  = darkblue, filecolor  = darkblue,
-  menucolor  = darkblue, urlcolor   = darkblue
-}
-
-\makeatletter
-\renewcommand{\@biblabel}[1]{#1.}
-\makeatother		
-		
-\begin{document}
-
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
-%\verb|\cite{*}| \cite{*}
-%
-%\verb|\citep{*}| \citep{*}
-%
-%\verb|\citet{*}| \citet{*}
-
-\newcommand{\allrefs}{Vasylenko92,
-Afanasyev92,
-Makilov91,
-Ponomarenko86,
-Belousova81,
-BibOp91,
-Poems82,
-HistLit82,
-Landau:eldin,
-BRLS94,
-Grosse80,
-GOST7184,
-ObchTech93,
-Bibdelo86,
-Ponomarenko79,
-Zeyts70,
-Ponoomarenko76,
-Malikov92,
-Ponomarenko86a,
-dixit.pindyck:options,
-RosGaz-article,
-Dolmatovskiy88,
-Ponomarenko88,
-Melikov95, Selikov95, Selikov+95,
-Gojchuk98,
-Polyakov98a,
-TranskSpivrob99:Purich,
-Luus82,
-KIA95-default,
-KIA85-autoref,
-Ponomarenko76,
-Report81-rep,
-Report81b-rep-notype,
-Report81-techrep,
-CatalogMamals81,
-Instr86,
-wiki:latex,
-wiki:latex-2,
-phys:moodle,
-EXFOR,
-IsaacNewton,
-IsaacNewton-sl:sn,
-PhysRevLett.101.085006}
-
-
-\verb|\citep|\par \citep{\allrefs}
-
-\verb|\citep*|\par \citep{\allrefs}
-
-\verb|\citeauthor|\par \citeauthor{\allrefs}
-
-\verb|\citeauthor*|\par \citeauthor*{\allrefs}
-
-\bibliographystyle{\mybibstyle}  
-\bibliography{bib/examples}     
-
-\end{document} 
-
-

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008-sorted.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,106 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-\newcommand*{\mybibstyle}{ugost2008s}
-
-\RequirePackage[utf8]{inputenc}
-
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst}. 
-   No customization is applied.
-
-   Пример оформления списка литературы с помощью стиля 
-   \texttt{\mybibstyle.bst}.
-   Команды форматирования не изменены.
-}
-
-\documentclass[a4paper]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T2A]{fontenc}
-\usepackage[ukrainian,russian]{babel}
-%\usepackage{natbib}
-\usepackage{geometry,ifpdf}
-\ifpdf
-  \usepackage[pdftex,hyperindex,unicode]{hyperref}
-  \usepackage{cmap}
-\else
-  \usepackage[hypertex]{hyperref}
-\fi
-\usepackage{color}
-\definecolor{darkblue}{rgb}{0,0,.6}
-\hypersetup{
-  pdftitle           = {\mytitle},
-  pdfauthor          = {Igor A. Kotelnikov},
-  pdfsubject         = {GOST, BibTeX},
-  pdfstartview       = {FitH},
-%  pdfborder          = {0 0 0},
-%  bookmarksopen      = true,
-  bookmarksnumbered  = true,
-%  bookmarksopenlevel = 2,
-  colorlinks = true,     linkcolor  = darkblue,
-  citecolor  = darkblue, filecolor  = darkblue,
-  menucolor  = darkblue, urlcolor   = darkblue
-}
-
-\makeatletter
-\renewcommand{\@biblabel}[1]{#1.}
-\makeatother		
-		
-\begin{document}
-
-\title{\mytitle}
-\maketitle
-\begin{abstract}
-  \mydescription
-\end{abstract}
-
-\newcommand{\allrefs}{Vasylenko92,
-Afanasyev92,
-Makilov91,
-Ponomarenko86,
-Belousova81,
-BibOp91,
-Poems82,
-HistLit82,
-Landau:eldin,
-BRLS94,
-Grosse80,
-GOST7184,
-ObchTech93,
-Bibdelo86,
-Ponomarenko79,
-Zeyts70,
-Ponoomarenko76,
-Malikov92,
-Ponomarenko86a,
-dixit.pindyck:options,
-RosGaz-article,
-Dolmatovskiy88,
-Ponomarenko88,
-Melikov95,
-Gojchuk98,
-Polyakov98a,
-TranskSpivrob99:Purich,
-Luus82,
-KIA95-default,
-KIA85-autoref,
-Ponomarenko76,
-Report81-rep,
-Report81b-rep-notype,
-Report81-techrep,
-CatalogMamals81,
-Instr86,
-wiki:latex,
-wiki:latex-2,
-phys:moodle,
-EXFOR,
-IsaacNewton,
-IsaacNewton-sl:sn,
-PhysRevLett.101.085006}
-
-\nocite{*}
-\cite{\allrefs}
-
-\bibliographystyle{\mybibstyle}  
-\bibliography{bib/examples}     
-
-\end{document} 

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,5 +1,6 @@
 \edef\mybibstyle{ugost2008}
 \RequirePackage[utf8]{inputenc}
+\RequirePackage{cmap}
 \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
 \newcommand{\mydescription}{
    Example of a bibliography using the style \texttt{\mybibstyle.bst}. 

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008l.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,5 +1,6 @@
 \edef\mybibstyle{ugost2008l}
 \RequirePackage[utf8]{inputenc}
+\RequirePackage{cmap}
 \newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
 \newcommand{\mydescription}{
    Example of a bibliography using the style \texttt{\mybibstyle.bst}. 

Added: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf	2017-01-16 23:13:28 UTC (rev 42974)

Property changes on: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008n.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,122 @@
+% !Mode:: "TeX:UTF-8"
+\newcommand*{\mybibstyle}{ugost2008n}
+
+\RequirePackage[utf8]{inputenc}
+\RequirePackage{cmap}
+
+\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
+\newcommand{\mydescription}{
+   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
+   and \texttt{natbib} package.
+   No customization is applied.
+
+   Пример оформления списка литературы с помощью стиля 
+   \texttt{\mybibstyle.bst} и пакета \texttt{natbib}.
+   Команды форматирования не изменены.
+}
+
+\documentclass[a4paper]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[ukrainian,russian]{babel}
+\usepackage{natbib}
+\usepackage{geometry,ifpdf}
+\ifpdf
+  \usepackage[pdftex,hyperindex,unicode]{hyperref}
+  \usepackage{cmap}
+\else
+  \usepackage[hypertex]{hyperref}
+\fi
+\usepackage{color}
+\definecolor{darkblue}{rgb}{0,0,.6}
+\hypersetup{
+  pdftitle           = {\mytitle},
+  pdfauthor          = {Igor A. Kotelnikov},
+  pdfsubject         = {GOST, BibTeX},
+  pdfstartview       = {FitH},
+%  pdfborder          = {0 0 0},
+%  bookmarksopen      = true,
+  bookmarksnumbered  = true,
+%  bookmarksopenlevel = 2,
+  colorlinks = true,     linkcolor  = darkblue,
+  citecolor  = darkblue, filecolor  = darkblue,
+  menucolor  = darkblue, urlcolor   = darkblue
+}
+
+\makeatletter
+\renewcommand{\@biblabel}[1]{#1.}
+\makeatother		
+		
+\begin{document}
+
+\title{\mytitle}
+\maketitle
+\begin{abstract}
+  \mydescription
+\end{abstract}
+
+%\verb|\cite{*}| \cite{*}
+%
+%\verb|\citep{*}| \citep{*}
+%
+%\verb|\citet{*}| \citet{*}
+
+\newcommand{\allrefs}{Vasylenko92,
+Afanasyev92,
+Makilov91,
+Ponomarenko86,
+Belousova81,
+BibOp91,
+Poems82,
+HistLit82,
+Landau:eldin,
+BRLS94,
+Grosse80,
+GOST7184,
+ObchTech93,
+Bibdelo86,
+Ponomarenko79,
+Zeyts70,
+Ponoomarenko76,
+Malikov92,
+Ponomarenko86a,
+dixit.pindyck:options,
+RosGaz-article,
+Dolmatovskiy88,
+Ponomarenko88,
+Melikov95, Selikov95, Selikov+95,
+Gojchuk98,
+Polyakov98a,
+TranskSpivrob99:Purich,
+Luus82,
+KIA95-default,
+KIA85-autoref,
+Ponomarenko76,
+Report81-rep,
+Report81b-rep-notype,
+Report81-techrep,
+CatalogMamals81,
+Instr86,
+wiki:latex,
+wiki:latex-2,
+phys:moodle,
+EXFOR,
+IsaacNewton,
+IsaacNewton-sl:sn,
+PhysRevLett.101.085006}
+
+
+\verb|\citep|\par \citep{\allrefs}
+
+\verb|\citep*|\par \citep{\allrefs}
+
+\verb|\citeauthor|\par \citeauthor{\allrefs}
+
+\verb|\citeauthor*|\par \citeauthor*{\allrefs}
+
+\bibliographystyle{\mybibstyle}  
+\bibliography{bib/examples}     
+
+\end{document} 
+
+

Added: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf	2017-01-16 23:13:28 UTC (rev 42974)

Property changes on: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008ns.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,123 @@
+% !Mode:: "TeX:UTF-8"
+\newcommand*{\mybibstyle}{ugost2008ns}
+
+\RequirePackage[utf8]{inputenc}
+\RequirePackage{cmap}
+
+\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
+\newcommand{\mydescription}{
+   Example of a bibliography using the style \texttt{\mybibstyle.bst} 
+   and \texttt{natbib} package.
+   No customization is applied.
+
+   Пример оформления списка литературы с помощью стиля 
+   \texttt{\mybibstyle.bst} и пакета \texttt{natbib}.
+   Команды форматирования не изменены.
+}
+
+\documentclass[a4paper]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[ukrainian,russian]{babel}
+\usepackage{natbib}
+\usepackage{geometry,ifpdf}
+\ifpdf
+  \usepackage[pdftex,hyperindex,unicode]{hyperref}
+  \usepackage{cmap}
+\else
+  \usepackage[hypertex]{hyperref}
+\fi
+\usepackage{color}
+\definecolor{darkblue}{rgb}{0,0,.6}
+\hypersetup{
+  pdftitle           = {\mytitle},
+  pdfauthor          = {Igor A. Kotelnikov},
+  pdfsubject         = {GOST, BibTeX},
+  pdfstartview       = {FitH},
+%  pdfborder          = {0 0 0},
+%  bookmarksopen      = true,
+  bookmarksnumbered  = true,
+%  bookmarksopenlevel = 2,
+  colorlinks = true,     linkcolor  = darkblue,
+  citecolor  = darkblue, filecolor  = darkblue,
+  menucolor  = darkblue, urlcolor   = darkblue
+}
+
+\makeatletter
+\renewcommand{\@biblabel}[1]{#1.}
+\makeatother		
+		
+\begin{document}
+
+\title{\mytitle}
+\maketitle
+\begin{abstract}
+  \mydescription
+\end{abstract}
+
+%\verb|\cite{*}| \cite{*}
+%
+%\verb|\citep{*}| \citep{*}
+%
+%\verb|\citet{*}| \citet{*}
+
+\newcommand{\allrefs}{Vasylenko92,
+Afanasyev92,
+Makilov91,
+Ponomarenko86,
+Belousova81,
+BibOp91,
+Poems82,
+HistLit82,
+Landau:eldin,
+BRLS94,
+Grosse80,
+GOST7184,
+ObchTech93,
+Bibdelo86,
+Ponomarenko79,
+Zeyts70,
+Ponoomarenko76,
+Malikov92,
+Ponomarenko86a,
+dixit.pindyck:options,
+RosGaz-article,
+Dolmatovskiy88,
+Ponomarenko88,
+Melikov95, Selikov95, Selikov+95,
+Gojchuk98,
+Polyakov98a,
+TranskSpivrob99:Purich,
+Luus82,
+KIA95-default,
+KIA85-autoref,
+Ponomarenko76,
+Report81-rep,
+Report81b-rep-notype,
+Report81-techrep,
+CatalogMamals81,
+Instr86,
+wiki:latex,
+wiki:latex-2,
+phys:moodle,
+EXFOR,
+IsaacNewton,
+IsaacNewton-sl:sn,
+PhysRevLett.101.085006}
+
+
+\verb|\citep|\par \citep{\allrefs}
+
+\verb|\citep*|\par \citep{\allrefs}
+
+\verb|\citeauthor|\par \citeauthor{\allrefs}
+
+\verb|\citeauthor*|\par \citeauthor*{\allrefs}
+
+
+\bibliographystyle{\mybibstyle}  
+\bibliography{bib/examples}     
+
+\end{document} 
+
+

Added: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf	2017-01-16 23:13:28 UTC (rev 42974)

Property changes on: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost2008s.tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -0,0 +1,106 @@
+% !Mode:: "TeX:UTF-8"
+\newcommand*{\mybibstyle}{ugost2008s}
+
+\RequirePackage[utf8]{inputenc}
+
+\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
+\newcommand{\mydescription}{
+   Example of a bibliography using the style \texttt{\mybibstyle.bst}. 
+   No customization is applied.
+
+   Пример оформления списка литературы с помощью стиля 
+   \texttt{\mybibstyle.bst}.
+   Команды форматирования не изменены.
+}
+
+\documentclass[a4paper]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[ukrainian,russian]{babel}
+%\usepackage{natbib}
+\usepackage{geometry,ifpdf}
+\ifpdf
+  \usepackage[pdftex,hyperindex,unicode]{hyperref}
+  \usepackage{cmap}
+\else
+  \usepackage[hypertex]{hyperref}
+\fi
+\usepackage{color}
+\definecolor{darkblue}{rgb}{0,0,.6}
+\hypersetup{
+  pdftitle           = {\mytitle},
+  pdfauthor          = {Igor A. Kotelnikov},
+  pdfsubject         = {GOST, BibTeX},
+  pdfstartview       = {FitH},
+%  pdfborder          = {0 0 0},
+%  bookmarksopen      = true,
+  bookmarksnumbered  = true,
+%  bookmarksopenlevel = 2,
+  colorlinks = true,     linkcolor  = darkblue,
+  citecolor  = darkblue, filecolor  = darkblue,
+  menucolor  = darkblue, urlcolor   = darkblue
+}
+
+\makeatletter
+\renewcommand{\@biblabel}[1]{#1.}
+\makeatother		
+		
+\begin{document}
+
+\title{\mytitle}
+\maketitle
+\begin{abstract}
+  \mydescription
+\end{abstract}
+
+\newcommand{\allrefs}{Vasylenko92,
+Afanasyev92,
+Makilov91,
+Ponomarenko86,
+Belousova81,
+BibOp91,
+Poems82,
+HistLit82,
+Landau:eldin,
+BRLS94,
+Grosse80,
+GOST7184,
+ObchTech93,
+Bibdelo86,
+Ponomarenko79,
+Zeyts70,
+Ponoomarenko76,
+Malikov92,
+Ponomarenko86a,
+dixit.pindyck:options,
+RosGaz-article,
+Dolmatovskiy88,
+Ponomarenko88,
+Melikov95,
+Gojchuk98,
+Polyakov98a,
+TranskSpivrob99:Purich,
+Luus82,
+KIA95-default,
+KIA85-autoref,
+Ponomarenko76,
+Report81-rep,
+Report81b-rep-notype,
+Report81-techrep,
+CatalogMamals81,
+Instr86,
+wiki:latex,
+wiki:latex-2,
+phys:moodle,
+EXFOR,
+IsaacNewton,
+IsaacNewton-sl:sn,
+PhysRevLett.101.085006}
+
+\nocite{*}
+\cite{\allrefs}
+
+\bibliographystyle{\mybibstyle}  
+\bibliography{bib/examples}     
+
+\end{document} 

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/ugost780._tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/gost/ugost780._tex	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/doc/bibtex/gost/ugost780._tex	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,16 +0,0 @@
-\edef\mybibstyle{ugost780}
-\newcommand*{\mytitle}{The GOST bundle: \mybibstyle.bst}
-\newcommand{\mydescription}{
-   Example of a bibliography using the style \texttt{\mybibstyle.bst}. 
-   No customization is applied.
-
-   Пример оформления списка литературы с помощью стиля 
-   \texttt{\mybibstyle.bst} и пакета \texttt{natbib}.
-   Команды форматирования не изменены.
-
-   Note: this is obsolete style.
-
-   Внимание: данный стиль устарел.
-   
-}
-\input ugost
\ No newline at end of file

Deleted: trunk/Master/texmf-dist/doc/bibtex/gost/ugost780.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/source/bibtex/gost/gost.dtx	2017-01-16 23:13:28 UTC (rev 42974)
@@ -7,8 +7,8 @@
 % attempt to format the bibliography according to
 % GOST R 7.0.5-2008 with some conventional modifications.
 %
-% Copyright 2012-2016 Igor A. Kotelnikov.
-% Version 1.2g
+% Copyright 2012-2017 Igor A. Kotelnikov.
+% Version 1.2i
 %
 % Copyright 1996-2005 Maksym Polyakov.
 % Version 2005.08.12
@@ -35,11 +35,12 @@
 % To unpack run
 %   latex gost.ins
 %
-% To produce documentation run
+% To produce the documentation run
 %    pdflatex gost.dtx
 %    makeindex -r -s gind.ist gost
 %    makeindex -r -s gglo.ist -o gost.gls gost.glo
 %    pdflatex gost.dtx
+%    pdflatex gost.dtx
 %
 % TeX Directory Structure
 %
@@ -48,11 +49,11 @@
 % Move all *.pdf files       to TDS:doc/bibtex/gost
 % Move gost.dtx and gost.ins to TDS:source/bibtex/gost/
 %
-% $Id: gost.dtx, v.2012/08/31 kia999 $
+% $Id: gost.dtx, v.2017/01/12 kia999 $
 %
 %<*driver>
 \ProvidesFile{gost.dtx}%
-  [2016/09/21 v.1.2h Bibliography styles for GOST R 7.0.5-2008.]
+  [2017/01/12 v.1.2i Bibliography styles for GOST R 7.0.5-2008.]
 
 \documentclass{ltxdoc}
 
@@ -62,7 +63,8 @@
   \usepackage[pdftex,hyperindex,unicode]{hyperref}
   \usepackage{cmap}
 \else
-  \usepackage[hypertex]{hyperref}
+  %\usepackage[hypertex]{hyperref}
+  \usepackage{hyperref}
 \fi
 \usepackage{color}
 \definecolor{darkblue}{rgb}{0,0,.6}
@@ -126,44 +128,29 @@
 %</driver>
 % \fi
 %
-% \CheckSum{548}
+% \CheckSum{592}
 %
-% \changes{v1.2h}{21 Sep 2016}{minor changes in documentation}
-% \changes{v1.2g}{25 Jul 2016}{minor changes in documentation}
-% \changes{v1.2f}{12 Jul 2016}{patent entry added}
-% \changes{v1.2e}{07 Jul 2016}{bbl.url added to replace URL string}
-% \changes{v1.2d}{18 Feb 2016}{\cs{bbljan} e.t.c. macros removed}
-% \changes{v1.2c}{18 Jan 2015}{langid field added}
-% \changes{v1.2c}{18 Jan 2015}{eid field added}
-% \changes{v1.2c}{17 Jan 2015}{fix Gost2003: "--- replaced by \cs{BibDash}}
-% \changes{v1.2b}{19 Jan 2014}{numpages renamed to pagetotal}
-% \changes{v1.2a}{31 Aug 2012}{Default for \cs{cyrdash} added}
-% \changes{v1.2}{20 Feb 2012}{Support for natbib package}
-% \changes{v1.2}{13 Feb 2012}{Fix bbl.urldate for ukrainian (Andrey Shvajkoy)}
-% \changes{v1.2}{02 Feb 2012}{Thesis entry, report entry}
-% \changes{v1.2}{01 Feb 2012}{Medium field}
-% \changes{v1.2}{30 Jan 2012}{Strict option}
-% \changes{v1.2}{29 Jan 2012}{Refactoring, Documentation}
-% \changes{v1.2}{26 Jan 2012}{Entries eprint, eprintclass, eprinttype}
-% \changes{v1.2}{26 Jan 2012}{Options modern, long, eprint}
-% \changes{v1.1}{25 Jan 2012}{Gost705.dtx borrowed from Disser pkg}
-% \changes{v1.1}{21 Jan 2012}{Upload to CTAN}
-% \changes{v1.1}{15 Jan 2012}{Added German, French, Italian languages}
-% \changes{v1.1}{15 Jan 2012}{Entry ONLINE}
-% \changes{v1.0}{12 Aug 2005}{Bug fix (long annote)}
-% \changes{v0.9}{07 Oct 2003}{Bug fix in names and date formatting}
-% \changes{v0.9}{07 Oct 2003}{Bug fix in INPROCEEDINGS}
-% \changes{v0.8}{10 Aug 2003}{\cs{BibEmph} added}
-% \changes{v0.8}{06 Jun 2003}{Entry ANNOTE added}
-% \changes{v0.8}{06 Jun 2003}{\cs{BibUrl} added}
-% \changes{v0.8}{06 Jun 2003}{\cs{BibAnnote} added}
-%
 % \DoNotIndex{\cyra,\cyrb,\cyrv,\cyrg,\cyrd,\cyre}
 % \DoNotIndex{\CYRP,\cyrii,\cyrr,\cyre,\cyro,\CYRU,\cyrk,\cyrl,\CYRS,\cyrs|}
 % \DoNotIndex{\cyrt,\cyri,\cyrz,\CYRT,\cyrm}
 % \DoNotIndex{\cyr,\cyrc,\CYRD,\cyrery,\cyrh,\CYRK,\CYRM,\CYRN,\cyrn}
 % \DoNotIndex{\cyrp,\cyrs,\cyrshch,\cyru,\CYRV,\cyrya}
+% \DoNotIndex{\CYRA,\CYRB,\cyrch,\CYRE,\CYREREV,\CYRF,\cyrf,\CYRI,\cyrishrt}
+% \DoNotIndex{\CYRO,\CYRR,\cyrsftsn,\CYRYA,\cyryu,\cyrzh}
 % \DoNotIndex{\z at skip,\z@}
+% \DoNotIndex{\|,\~,\ }
+% \DoNotIndex{\\&,\',\(,\),\`,\\,\/,\.}
+% \DoNotIndex{\begin,\DeclareUTFcharacter}
+% \DoNotIndex{\csname,\def}
+% \DoNotIndex{\else,\endcsname,\end}
+% \DoNotIndex{\expandafter,\fi}
+% \DoNotIndex{\hbox,\hss}
+% \DoNotIndex{\iffalse,\ifx,\ignorespaces,\iflanguage}
+% \DoNotIndex{\language,\lastskip,\ldots,\let,\natexlab,\newblock,\nobreak}
+% \DoNotIndex{\providecommand,\ProvideTextCommandDefault,\relax,\renewcommand}
+% \DoNotIndex{\selectlanguage,\selectlanguageifdefined,\small,\textemdash}
+% \DoNotIndex{\textnumero,\unskip,\url,\UTFencname}
+% \DoNotIndex{\,,\catcode,\cite,\citeauthor,\citet,\citeyear,\href,\hskip,\ifdim}
 %
 % \begin{abstract}
 %
@@ -432,16 +419,45 @@
 %   \end{enumerate}
 %
 %
-%   \subsection{What's new in version 1.2h (2016.08.21)}
+%   \subsection{Version history}
 %
+%   \subsubsection*{Version 1.2i (2017.01.12)}
+%
 %   \begin{enumerate}
 %   \item
+%   Documentation and examples update (thanks to Leonid Sinev).
+%
+%   \item
+%   Restored |@MastersThesis| instead of |@MasterThesis| (thanks to Leonid Sinev).
+%
+%   \item
+%   |media="eresource"| is introduced in addition to |media="online"| and
+%   |media="text"|; if present, the |media| field is not ignored any more in
+%   modern bst-styles compiled without the |strict| option.
+%
+%   \item
+%   |location| field is introduced as an alias of |address| field.
+%
+%   \item
+%   |@DSCISTHESIS| entry renamed to |@DOCTHESIS|.
+%
+%   \item
+%   |school| field in |@THESIS| and similar entries is replaced by
+%   |institution| to comply with |biblatex-gost| style.
+%
+%   \end{enumerate}
+%
+%
+%   \subsubsection*{Version 1.2h (2016.08.21)}
+%
+%   \begin{enumerate}
+%   \item
 %   Minor changes in documentation.
 %
 %   \end{enumerate}
 %
 %
-%   \subsection{What's new in version 1.2g (2016.07.25)}
+%   \subsubsection*{Version 1.2g (2016.07.25)}
 %
 %   \begin{enumerate}
 %   \item
@@ -450,7 +466,7 @@
 %   \end{enumerate}
 %
 %
-%   \subsection{What's new in version 1.2f (2016.07.12)}
+%   \subsubsection*{Version 1.2f (2016.07.12)}
 %
 %   \begin{enumerate}
 %   \item
@@ -457,11 +473,11 @@
 %   Support for patent entry added (thanks to Stanislav Kruchinin).
 %
 %   \item
-%   medium field renamed to media field.
+%   |medium| field renamed to |media| field for compatibility with biblatex.
 
 %   \end{enumerate}
 %
-%   \subsection{What's new in version 1.2e (2016.07.07)}
+%   \subsubsection*{Version 1.2e (2016.07.07)}
 %
 %   \begin{enumerate}
 %   \item
@@ -470,17 +486,17 @@
 %
 %   \end{enumerate}
 %
-%   \subsection{What's new in version 1.2d (2015.02.18)}
+%   \subsubsection*{Version 1.2d (2015.02.18)}
 %
 %   \begin{enumerate}
 %   \item
-%   jan, feb, e.t.c. macros fixed.
+%   jan, feb, etc. macros fixed.
 %
 %   \item
 %   New macro format.month.
 %   \end{enumerate}
 %
-%   \subsection{What's new in version 1.2c (2015.01.10)}
+%   \subsubsection*{Version 1.2c (2015.01.10)}
 %
 %   \begin{enumerate}
 %   \item
@@ -500,7 +516,7 @@
 %   Spacing around |\BibDash| has been improved.
 %
 %   \item
-%   |\BibDash| now typesets short em-dash (|\cyrdahs|) only for |russian| and
+%   |\BibDash| now typesets short em-dash (|\cyrdash|) only for |russian| and
 %   |ukrainian| languages.  In earlier versions, it produces short em-dash for
 %   all languages.
 %
@@ -508,7 +524,7 @@
 %
 %   \end{enumerate}
 %
-%   \subsection{What's new in version 1.2a (2012.08.31)}
+%   \subsubsection*{Version 1.2a (2012.08.31)}
 %
 %   \begin{enumerate}
 %
@@ -518,7 +534,7 @@
 %
 %   \end{enumerate}
 %
-%   \subsection{What's new in version 1.2 (2012.02.22)}
+%   \subsubsection*{Version 1.2 (2012.02.22)}
 %
 %   \begin{enumerate}
 %   \item
@@ -525,7 +541,7 @@
 %   Code refactoring. All styles are now generated from single source file.
 %
 %   \item
-%   Support for GOST-7.1-2003. The field |medium| is added to reflect type
+%   Support for GOST 7.1-2003. The field |medium| is added to reflect type
 %   of material. For most entry types |medium| defaults to |text|.
 %
 %   \item
@@ -537,7 +553,7 @@
 %   \end{enumerate}
 %
 %
-%   \subsection{What's new in version 1.1 (2012.01.21)}
+%   \subsubsection*{Version 1.1 (2012.01.21)}
 %
 %   \begin{enumerate}
 %   \item
@@ -553,13 +569,13 @@
 %   \item
 %   |@DSciThesis| entry is added to format a reference to doctor of
 %   sciences thesis.
-
+%
 %   \item
 %   |Urldate|, |eprint|, |eprintclass|, |eprinttype| fields are added.
 %
 %   \end{enumerate}
 %
-%   \subsection{Version history}
+%   \subsubsection{Older versions}
 %
 %   \begin{enumerate}
 %   \item[2012.02.22] Support for |natbib| package.
@@ -574,6 +590,7 @@
 %       entry is described; numbers in black roman refer to the code lines where
 %       the entry is used.
 %   }
+%   \GlossaryPrologue{\section{Change History}}
 %   \PrintChanges
 %   \PrintIndex
 % }
@@ -590,7 +607,7 @@
 %<*bst>
 %%
 %% This bibstyle attempts to format bibliography according to
-%<!modern>%% GOST 7.80-2000 for bibliographic records.
+%<!modern>%% GOST 7.1-2003 for bibliographic records.
 %<modern>%% GOST 7.0.5-2008 for bibliographic reference.
 %<*natbib>%%
 %%-------------------------------------------------------------------
@@ -626,6 +643,11 @@
 %
 % Enlist all entry types allowed in a bibliographic database.
 % Most entries are common for many standard bst styles.
+% \changes{v1.2f}{12 Jul 2016}{entry \texttt{patent} added}
+% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{langid} added}
+% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{eid} added}
+% \changes{v1.2}{01 Feb 2012}{entry field \texttt{medium} added}
+% \changes{v0.8}{06 Jun 2003}{entry field \texttt{annote} added}
 %    \begin{macrocode}
 ENTRY
   { address
@@ -641,50 +663,52 @@
     institution
     journal
     key
+    %major          % new in v.1.2i, alias for speciality, not implemented
+    majorcode       % new in v.1.2i, alias for specialitycode
     month
     note
     number
     organization
     pages
-    eid % new in v1.2c
+    eid             % new in v1.2c
     publisher
-    school
+    school          % alias for institution
     series
+    %speciality     % new in v.1.2i, eqv. to major in biblatex-gost, not implemented yet...
+    specialitycode  % new in v.1.2i, alias of number, eqv. to majorcode in biblatex-gost
     title
-    %medium % new in v1.2; renamed to media.
-    media % new in v1.2f
+    %medium         % new in v1.2; renamed to media.
+    media           % new in v1.2f
     type
     volume
     year
     language
-    langid % new in v1.2c
+    langid          % new in v1.2c
     booklanguage
 %    \end{macrocode}
 %   Entries borrowed from biblatex.
+% \changes{v1.2b}{19 Jan 2014}{entry field \texttt{numpages} renamed to \texttt{pagetotal}}
+% \changes{v1.2}{26 Jan 2012}{entry fields \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype} added}
 %    \begin{macrocode}
-    date         % new in v1.2f; not implemented yet...
+    %date            % not implemented yet...
     pagetotal
     url
     urldate
     isbn
     doi
-%    archive
-    eprinttype   % = archivePrefix
-    eprintclass  % = primaryClass
+    eprinttype      % = archivePrefix
+    eprintclass     % = primaryClass
     eprint
-%    \end{macrocode}
-%   Entries borrowed from disser.bst by S.Kruchinin.
-%    \begin{macrocode}
     % new in v1.2f:
     % appear in biblatex:
-    addendum
-    holder
-    location
-    subtitle
-    titleaddon
-    version
-    % Appear in biblatex-gost:
-    authorcountry   % ??
+    %addendum       % not implemented yet...
+    holder          % see patent
+    location        % new in v.1.2i, alias of address
+    %subtitle       % not implemented yet...
+    titleaddon      % new in v.1.2i, see @thesis
+    %version        % not implemented yet...
+    % Appear in biblatex-gost for @patent entry:
+    authorcountry   % country of the patent authors
     credits         % statement of responsibility, other than provided in Biblatex
     ipc             % Code of the International Patent Classification
     %media          % General material designation NOTE: medium in the above
@@ -746,6 +770,9 @@
 %
 % Declare functions to output various parts of bibliographic record.
 % \DescribeFunction{output.nonnull}
+% Function |output.nonnull| writes to output buffer the last literal in the stack
+% assuming that it is not empty and adds an appropriate punctuation symbol.
+% \changes{v1.2c}{17 Jan 2015}{fix Gost2003: \texttt{"}\texttt{-}\texttt{-}\texttt{-} replaced by macro \cs{BibDash}}
 %    \begin{macrocode}
 FUNCTION {output.nonnull}
 {
@@ -790,6 +817,10 @@
 %    \end{macrocode}
 %
 % \DescribeFunction{output}
+% Function |output| calls |output.nonnul| is the last literal string in the stack
+% if it is not empty; otherwise it discards the literal.
+% Function |output.check| do the same but also warns if the indicated field is
+% empty.
 % \DescribeFunction{output.check}
 %    \begin{macrocode}
 FUNCTION {output}
@@ -998,6 +1029,7 @@
 %    \end{macrocode}
 % \DescribeFunction{new.dblslash.checka}
 % For |online| entry.
+% \changes{v1.1}{15 Jan 2012}{entry type \texttt{@online} added}
 %    \begin{macrocode}
 FUNCTION {new.dblslash.checka}
 { empty$
@@ -1020,6 +1052,7 @@
 %
 % \DescribeFunction{emphasize}
 % Declare function to emphasize last string in stack.
+% \changes{v0.8}{10 Aug 2003}{macro \cs{BibEmph} added}
 %    \begin{macrocode}
 FUNCTION {emphasize}
 { duplicate$ empty$
@@ -1436,6 +1469,7 @@
 %    \end{macrocode}
 % Next function was added in version 2016.07.07.
 % \DescribeFunction{bbl.url}
+% \changes{v1.2e}{07 Jul 2016}{\texttt{bbl.url} added to replace URL string}
 %    \begin{macrocode}
 FUNCTION {bbl.url}
 { curlanguage "english" =
@@ -1456,6 +1490,7 @@
 %    \end{macrocode}
 % Next function was added in version 2012.01.15.
 % \DescribeFunction{bbl.urldate}
+% \changes{v1.2}{13 Feb 2012}{fix \texttt{bbl.urldate} for ukrainian (Andrey Shvajkoy)}
 %    \begin{macrocode}
 FUNCTION {bbl.urldate}
 { curlanguage "english" =
@@ -1491,9 +1526,9 @@
 if$}
 
 %    \end{macrocode}
-% \DescribeFunction{bbl.mthesis}
+% \DescribeFunction{bbl.mathesis}
 %    \begin{macrocode}
-FUNCTION {bbl.mthesis}
+FUNCTION {bbl.mathesis}
 { curlanguage "english" =
    { "Master's thesis" }
    { curlanguage "german" =
@@ -1510,6 +1545,7 @@
 
 %    \end{macrocode}
 % \DescribeFunction{bbl.phdthesis}
+% \changes{v1.2i}{04 Jan 2017}{corrected bbl.phdthesis and bbl.docthesis to comply GOST}
 %    \begin{macrocode}
 FUNCTION {bbl.phdthesis}
 { curlanguage "english" =
@@ -1517,9 +1553,9 @@
    { curlanguage "german" =
       { "Diss.~Ph.\,D." }
       { curlanguage "russian" =
-%<!utf8>         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrk\cyra\cyrn\cyrd\cyri"
-%<!utf8>           "\cyrd\cyra\cyrt\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-%<utf8>         { "{Дисс\ldots\ кандидата наук}" }
+%<!utf8>         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrk\cyra\cyrn\cyrd. "
+%<!utf8>           "\cyrn\cyra\cyru\cyrk}" * }
+%<utf8>         { "{дис.\ \ldots\ канд. наук}" }
          { curlanguage "french" =
            { "Th\`{e}se de doctorat" }
            { "language is not defined: " language "phdthesis" * * warning$ "Ph.\,D. thesis" }
@@ -1529,23 +1565,40 @@
 if$}
 
 %    \end{macrocode}
-% \DescribeFunction{bbl.dscithesis}
+% \DescribeFunction{bbl.docthesis}
 %    \begin{macrocode}
-FUNCTION {bbl.dscithesis}
+FUNCTION {bbl.docthesis}
 { curlanguage "english" =
    { "Dr.\,Sci. dissertation" }
    { curlanguage "german" =
       { "Diss.~Dr." }
       { curlanguage "russian" =
-%<!utf8>         { "{\cyr\CYRD\cyri\cyrs\cyrs\ldots\ \cyrd\cyro\cyrk\cyrt\cyro"
-%<!utf8>           "\cyrr\cyra\ \cyrn\cyra\cyru\cyrk}" * }
-%<utf8>         { "{Дисс\ldots\ доктора наук}" }
-         { "language is not defined: " language "dscithesis" * * warning$ "Dr.\,Sci. dissertation" }
+%<!utf8>         { "{\cyr\cyrd\cyri\cyrs.\ \ldots\ \cyrd-\cyrr\cyra\ "
+%<!utf8>           "\cyrn\cyra\cyru\cyrk}" * }
+%<utf8>         { "{дис.\ \ldots\ д-ра наук}" }
+         { "language is not defined: " language "docthesis" * * warning$ "Dr.\,Sci. dissertation" }
       if$}
    if$}
 if$}
 
 %    \end{macrocode}
+% \DescribeFunction{bbl.thesis.type`}
+%    \begin{macrocode}
+FUNCTION {bbl.thesis.type}
+{ type "mathesis" =
+  { bbl.mathesis }
+  { type "phdthesis" =
+    { bbl.phdthesis }
+    { type "docthesis" =
+      { bbl.docthesis }
+      %%{ "!!!" type * "t" change.case$ }
+%<!utf8>      { type "t" change.case$ }
+%<utf8>      { type }
+    if$}
+  if$}
+if$}
+
+%    \end{macrocode}
 % \DescribeFunction{bbl.nnoaddress}
 %    \begin{macrocode}
 FUNCTION {bbl.nnoaddress}
@@ -1598,16 +1651,18 @@
 if$}
 
 %    \end{macrocode}
-% \DescribeFunction{bbl.media.elres}
+% \DescribeFunction{bbl.media.eresource}
 %    \begin{macrocode}
-FUNCTION {bbl.media.elres}
+FUNCTION {bbl.media.eresource}
 { curlanguage "english" =
    { "Electronic resource" }
    { curlanguage "russian" =
-%<!utf8>      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+%<!utf8>      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+%<!utf8>        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
 %<utf8>      { "{Электронный ресурс}" }
       { curlanguage "ukrainian" =
-%<!utf8>        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" }
+%<!utf8>        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+%<!utf8>          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs}" * }
 %<utf8>        { "{Електронний ресурс}" }
         { "language is not defined: " language "media" * * warning$ "Electronic resource" }
       if$}
@@ -1615,6 +1670,26 @@
 if$}
 
 %    \end{macrocode}
+% \DescribeFunction{bbl.media.online}
+% \changes{v1.2i}{02 Jan 2017}{\texttt{media} field normalised}
+%    \begin{macrocode}
+FUNCTION {bbl.media.online}
+{ curlanguage "english" =
+   { "Electronic resource online" }
+   { curlanguage "russian" =
+%<!utf8>      { "{\cyr\CYREREV\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyrery\cyrishrt\ "
+%<!utf8>        "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyrn}" * }
+%<utf8>      { "{Электронный ресурс онлайн}" }
+      { curlanguage "ukrainian" =
+%<!utf8>        { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ "
+%<!utf8>          "\cyrr\cyre\cyrs\cyru\cyrr\cyrs\ \cyro\cyrn\cyrl\cyra\cyrishrt\cyr}" * }
+%<utf8>        { "{Електронний ресурс онлайн}" }
+        { "language is not defined: " language "media" * * warning$ "Electronic resource" }
+      if$}
+   if$}
+if$}
+
+%    \end{macrocode}
 % \DescribeFunction{bbl.chief}
 %    \begin{macrocode}
 FUNCTION {bbl.chief}
@@ -1651,10 +1726,18 @@
 %    \end{macrocode}
 % \DescribeFunction{bbl.media}
 %    \begin{macrocode}
+%FUNCTION {bbl.media}
+%{ type$ "online" =
+%   { bbl.media.eresource }
+%   { bbl.media.text  }
+%if$}
 FUNCTION {bbl.media}
-{ type$ "online" =
-   { bbl.media.elres }
-   { bbl.media.text  }
+{ media "online" =
+   { bbl.media.online }
+   { media "eresource" =
+     { bbl.media.eresource }
+     { bbl.media.text }
+   if$}
 if$}
 
 %    \end{macrocode}
@@ -2081,6 +2164,7 @@
 % \DescribeFunction{format.month}
 % New in version 1.2d. This macro reads month field and translate English names
 % of months to Russian if current language is Russian.
+% \changes{v1.2i}{29 Dec 2016}{typo fix in \texttt{format.month}}
 %    \begin{macrocode}
 FUNCTION {format.month}
 { month empty$
@@ -2111,7 +2195,7 @@
 %<!utf8>            { "\CYRA\cyrv\cyrg\." }
 %<utf8>            { "Авг." }
         { month "Sep." =
-%<!utf8>            { "\CYRS\cyre\cyn\cyrt." }
+%<!utf8>            { "\CYRS\cyre\cyrn\cyrt." }
 %<utf8>            { "Сент." }
         { month "Oct." =
 %<!utf8>            { "\CYRO\cyrk\cyrt." }
@@ -2130,6 +2214,7 @@
 }
 %    \end{macrocode}
 % \DescribeFunction{format.date}
+% \changes{v1.2c}{17 Jan 2015}{fix Gost2003: \texttt{"}\texttt{-}\texttt{-}\texttt{-} replaced by macro \cs{BibDash}}
 %    \begin{macrocode}
 FUNCTION {format.date}
 { year empty$
@@ -2150,15 +2235,82 @@
 }
 
 %    \end{macrocode}
+% \DescribeFunction{address.or.location}
+% New function in version 1.2i. Returns |address| value if not empty; otherwise
+% returns |location| value even if the latter is empty.
+% \changes{v1.2i}{02 Jan 2017}{\texttt{location} field added as alias to \texttt{address} field}
+%    \begin{macrocode}
+%FUNCTION {address.or.location}
+%{
+%  address empty$
+%    { location empty$
+%      'skip$
+%      { location }
+%    if$ }
+%    { address }
+%  if$
+%}
+FUNCTION {address.or.location}
+{
+  address empty$
+    { location }
+    { address }
+  if$
+}
+
+%    \end{macrocode}
+%
+% \DescribeFunction{specialitycode.or.number}
+% New function in version 1.2i. Returns |specialitycode| value if not empty; otherwise
+% returns |number| value even if the latter is empty.
+% \changes{v1.2i}{13 Jan 2017}{\texttt{number} field is now alias to \texttt{specialitycode}}
+%    \begin{macrocode}
+FUNCTION {specialitycode.or.number}
+{
+  specialitycode empty$
+    { number }
+    { specialitycode }
+  if$
+}
+
+%    \end{macrocode}
+%
+% \DescribeFunction{institution.or.school}
+% New function in version 1.2i. Returns |institution| value if not empty; otherwise
+% returns |school| value even if the latter is empty.
+% \changes{v1.2i}{13 Jan 2017}{\texttt{school} field is now alias to \texttt{instituttion}}
+%    \begin{macrocode}
+FUNCTION {institution.or.school}
+{
+  institution empty$
+    { school}
+    { institution }
+  if$
+}
+%    \end{macrocode}
+%
 % \DescribeFunction{format.address.publisher}
 % \DescribeFunction{format.address.publisher.date}
 %    \begin{macrocode}
 %<*!strict>
+%FUNCTION {output.address.publisher}
+%{
+%  address empty$
+%    'skip$
+%    { address output
+%      publisher empty$
+%        'skip$
+%        { new.colon }
+%      if$
+%    }
+%  if$
+%  publisher output
+%}
 FUNCTION {output.address.publisher}
 {
-  address empty$
+  address empty$ location empty$ and
     'skip$
-    { address output
+    { address.or.location output
       publisher empty$
         'skip$
         { new.colon }
@@ -2208,6 +2360,7 @@
 
 %    \end{macrocode}
 % \DescribeFunction{output.bibitem}
+% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{langid} added}
 %    \begin{macrocode}
 %<*!natbib>
 FUNCTION {output.bibitem}
@@ -2621,6 +2774,7 @@
 
 %    \end{macrocode}
 % \DescribeFunction{format.pages}
+% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{eid} added}
 %    \begin{macrocode}
 %%FUNCTION {format.pages}
 %%{ pages empty$
@@ -2654,6 +2808,8 @@
 
 %    \end{macrocode}
 % \DescribeFunction{format.pages.page}
+% \changes{v1.2c}{18 Jan 2015}{entry field \texttt{eid} added}
+% \changes{v1.2b}{19 Jan 2014}{entry field \texttt{numpages} renamed to \texttt{pagetotal}}
 %    \begin{macrocode}
 %%FUNCTION {format.pages.page}
 %%{ pages empty$
@@ -2761,16 +2917,23 @@
 %    \end{macrocode}
 % \DescribeFunction{format.thesis.type}
 %    \begin{macrocode}
+%FUNCTION {format.thesis.type}
+%{ type empty$
+%    'skip$
+%    { pop$
+%%<!utf8>      bbl.thesis.type "t" change.case$
+%%<utf8>      bbl.thesis.type
+%    }
+%  if$
+%}
 FUNCTION {format.thesis.type}
 { type empty$
     'skip$
     { pop$
-%<!utf8>      type "t" change.case$
-%<utf8>      type
+      bbl.thesis.type
     }
   if$
 }
-
 %    \end{macrocode}
 % \DescribeFunction{format.techrep.type.number}
 % Function to format report type and number.
@@ -2953,6 +3116,7 @@
 
 %    \end{macrocode}
 % \DescribeFunction{format.url}
+% \changes{v0.8}{06 Jun 2003}{macro \cs{BibUrl} added}
 %    \begin{macrocode}
 FUNCTION {format.url}
 { url empty$
@@ -2981,6 +3145,7 @@
 
 %    \end{macrocode}
 % \DescribeFunction{format.annote}
+% \changes{v0.8}{06 Jun 2003}{macro \cs{BibAnnote} added}
 %    \begin{macrocode}
 FUNCTION {format.annote}
 { annote empty$
@@ -3039,10 +3204,22 @@
 
 %    \end{macrocode}
 % \DescribeFunction{add.media}
-% New in version 2. Adds media field if |strict| options is in effect.
+% New in version 1.2. Adds |media| field if |strict| options is in effect.
+% If the |media| field is empty |add.media| prints a value based on the |type|
+% field. If the |type| is also empty |add.media| prints equivalent of the
+% word |text| in current language.
 %    \begin{macrocode}
 %<*!strict>
-FUNCTION {add.media} { }
+FUNCTION {add.media}
+{ duplicate$ empty$
+    'skip$
+    { media empty$
+        'skip$
+        { " " * bbl.media enclose.square.brackets * }
+      if$
+    }
+  if$
+}
 %</!strict>
 %<*strict>
 FUNCTION {add.media}
@@ -3049,10 +3226,8 @@
 { duplicate$ empty$
     'skip$
     { media empty$
+        { " " * bbl.media.text enclose.square.brackets * }
         { " " * bbl.media enclose.square.brackets * }
-        { " " * media enclose.square.brackets * }
-%%        { bbl.media enclose.square.brackets * }
-%%        { media enclose.square.brackets * }
       if$
     }
   if$
@@ -3085,6 +3260,7 @@
 % Also see eprinttype and eprintclass.
 %
 % This function should use url. TO BE DONE YET.
+% \changes{v1.2}{26 Jan 2012}{entry fields \texttt{eprint}, \texttt{eprintclass}, \texttt{eprinttype}}
 %    \begin{macrocode}
 %<*eprint>
 %FUNCTION {format.eprint}
@@ -3163,6 +3339,7 @@
 %
 % Functions added in v1.2f to format patent entry (thanks to Stanislav Kruchinin).
 %
+% \changes{v1.2f}{12 Jul 2016}{entry field \texttt{patent} added}
 % \DescribeFunction{add.number}
 %    \begin{macrocode}
 FUNCTION {add.number}
@@ -3353,7 +3530,7 @@
   editor.organization.after
   new.block
   howpublished output
-  address output
+  address.or.location output
   format.date "year" output.check
   new.block
   note output
@@ -3484,16 +3661,6 @@
   new.block
   format.bvolume output
   format.number.series output
-%  address empty$
-%    { publisher output
-%      format.date "year" output.check
-%    }
-%    { address output.nonnull
-%      format.date "year" output.check
-%      new.sentence
-%      publisher output
-%    }
-%  if$
   output.address.publisher
   format.date "year" output.check
   new.block
@@ -3517,6 +3684,7 @@
 % venue, language, volume, part, volumes, series, number, note, organization,
 % publisher, location, month, isbn, chapter, pages, addendum, pubstate, doi,
 % eprint, eprintclass, eprinttype, url, urldate.
+% \changes{v0.9}{07 Oct 2003}{bug fix in \texttt{@inproceedings} entry type}
 %    \begin{macrocode}
 FUNCTION {inproceedings}
 { output.bibitem
@@ -3634,7 +3802,7 @@
   new.colon
   format.type.number output
   add.blank
-  location output
+  address.or.location output
   new.colon
   ipc output
   new.slash
@@ -3736,6 +3904,7 @@
 %
 % Optional fields: subtitle, titleaddon, language, version, note,
 % organization, date, month, year, addendum, pubstate, urldate.
+% \changes{v1.1}{15 Jan 2012}{Entry type \texttt{@online} added}
 %    \begin{macrocode}
 FUNCTION {online}
 { output.bibitem
@@ -3787,6 +3956,7 @@
 % chapter, pages, pagetotal, addendum, pubstate, doi, eprint, eprintclass,
 % eprinttype, url, urldate
 %
+% \changes{v1.2}{02 Feb 2012}{\texttt{@thesis} entry}
 %    \begin{macrocode}
 %<*!(modern|strict)>
 FUNCTION {thesis}
@@ -3798,7 +3968,8 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -3818,14 +3989,18 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-%  bbl.phdthesis format.thesis.type output.nonnull
-  type "type" output.check
+  %%type "type" output.check
+  bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -3855,6 +4030,7 @@
 % Optional fields: subtitle, titleaddon, language, number, version, note,
 % location, month, isrn, chapter, pages, pagetotal, addendum, pubstate, doi,
 % eprint, eprintclass, eprinttype, url, urldate.
+% \changes{v1.2}{02 Feb 2012}{\texttt{@report} entry}
 %    \begin{macrocode}
 %FUNCTION {report}
 %{
@@ -3898,13 +4074,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -3940,7 +4117,8 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -3962,11 +4140,15 @@
   new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -3986,9 +4168,10 @@
 % \DescribeFunction{mastersthesis}
 % Similar to |@thesis| except that the type field is optional and defaults to the localized
 % term `Master's thesis'. You may still use the type field to override that.
+% \changes{v1.2i}{29 Dec 2016}{entry \texttt{@MastersThesis} added again (see v1.1)}
 %    \begin{macrocode}
 %<*!(modern|strict)>
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
 %<natbib>  author format.key output
@@ -3995,9 +4178,10 @@
   new.sentence
   format.btitle "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -4010,7 +4194,7 @@
 }
 %</!(modern|strict)>
 %<*modern|strict>
-FUNCTION {masterthesis}
+FUNCTION {mastersthesis}
 { output.bibitem
   format.authors "author" output.check
 %<natbib>  author format.key output
@@ -4017,13 +4201,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.mthesis format.thesis.type output.nonnull
+  bbl.mathesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -4040,12 +4228,13 @@
 %</modern|strict>
 
 %    \end{macrocode}
-% \DescribeFunction{dscithesis}
+% \DescribeFunction{docthesis}
 % Similar to |@thesis| except that the type field is optional and defaults to the localized
 % term `Doctor's of sciences thesis'. You may still use the type field to override that.
+% \changes{v1.2i}{02 Jan 2017}{\texttt{@dscithesis} entry renamed to \texttt{@docthesis}}
 %    \begin{macrocode}
 %<*!(modern|strict)>
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
 %<natbib>  author format.key output
@@ -4052,9 +4241,10 @@
   new.sentence
   format.btitle "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.slash
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher.date
   new.block
@@ -4067,7 +4257,7 @@
 }
 %</!(modern|strict)>
 %<*modern|strict>
-FUNCTION {dscithesis}
+FUNCTION {docthesis}
 { output.bibitem
   format.authors "author" output.check
 %<natbib>  author format.key output
@@ -4074,13 +4264,17 @@
   new.sentence
   format.btitle add.doi add.media "title" output.check
   new.colon
-  bbl.dscithesis format.thesis.type output.nonnull
+  bbl.docthesis format.thesis.type output.nonnull
   new.colon
-  number output
+  %%number output % code of the speciality
+  specialitycode.or.number output % code of the speciality, new in v.1.2i
+  new.colon
+  titleaddon output % date of defence and approvement; new in v.1.2i
   new.slash
   format.authors.after output
   new.semicolon
-  school "school" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.block
   output.address.publisher
   format.date "year" output.check
@@ -4151,13 +4345,14 @@
   new.colon
   number output
   new.slash
-  institution "institution" output.check
+  %institution "institution" output.check
+  institution.or.school "institution/school" output.check
   new.semicolon
   format.chief.after output % from editor field
   new.semicolon
   format.executor.after output % from author field
   new.block
-  address output
+  address.or.location output
   new.colon
   organization output
   format.date "year" output.check
@@ -4171,7 +4366,6 @@
   fin.entry
 }
 
-
 %    \end{macrocode}
 % \DescribeFunction{default.type}
 %    \begin{macrocode}
@@ -4184,6 +4378,7 @@
 %  backward compatibility with standard .bst styles which are designed for English.
 %  The string in the definition of any month macro must coincide with that used in
 %  |format.month| function in the above.
+% \changes{v1.2d}{18 Feb 2016}{\cs{bbljan} etc. macros removed}
 %    \begin{macrocode}
 MACRO {jan} {"Jan."}
 MACRO {feb} {"Feb."}
@@ -4836,6 +5031,10 @@
 % \DescribeFunction{begin.bib}
 % Within |thebibliography| environment we define few formatting macros
 % for user to customize how the reference list is formatted.
+% \changes{v1.2a}{31 Aug 2012}{default for \cs{cyrdash} added}
+% \changes{v0.8}{06 Jun 2003}{macro \cs{BibAnnote} added}
+% \changes{v0.8}{06 Jun 2003}{macro \cs{BibUrl} added}
+% \changes{v0.8}{10 Aug 2003}{macro \cs{BibEmph} added}
 %    \begin{macrocode}
 FUNCTION {begin.bib}
 { "\begin{thebibliography}{"  longest.label  * "}" * write$ newline$

Modified: trunk/Master/texmf-dist/source/bibtex/gost/gost.ins
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/gost/gost.ins	2017-01-16 23:12:37 UTC (rev 42973)
+++ trunk/Master/texmf-dist/source/bibtex/gost/gost.ins	2017-01-16 23:13:28 UTC (rev 42974)
@@ -1,4 +1,4 @@
-\input docstrip
+    \input docstrip
 
 \keepsilent
 
@@ -15,7 +15,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>



More information about the tex-live-commits mailing list