1 files changed, 52 insertions, 37 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
index 679902f5a8c..e5a48f92f65 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
@@ -1,8 +1,8 @@
 \ProvidesFile{gost-standard.bbx}
-[2017/02/16\space v1.13\space biblatex-gost styles]
+[2017/05/03\space v1.14\space biblatex-gost styles]
 
-\def\bbx@gost@date{2017/02/16}
-\def\bbx@gost@version{1.13}
+\def\bbx@gost@date{2017/05/03}
+\def\bbx@gost@version{1.14}
 
 \@ifpackagelater{biblatex}{2016/09/07}
   {}
@@ -46,6 +46,30 @@
 
 %  OPTIONS
 
+\DeclareBibliographyOption{otherlangs}[true]{%
+  \ifstrequal{#1}{true}
+    {\DeclareLanguageMapping{brazilian}{brazilian-gost}
+      \DeclareLanguageMapping{catalan}{catalan-gost}
+      \DeclareLanguageMapping{croatian}{croatian-gost}
+      \DeclareLanguageMapping{english}{english-gost}
+      \DeclareLanguageMapping{greek}{greek-gost}
+      \DeclareLanguageMapping{icelandic}{icelandic-gost}
+      \DeclareLanguageMapping{italian}{italian-gost}
+      \DeclareLanguageMapping{portuguese}{portuguese-gost}
+      \DeclareLanguageMapping{slovene}{slovene-gost}
+      \DeclareLanguageMapping{spanish}{spanish-gost}}
+    {\DeclareLanguageMapping{brazilian}{brazilian}
+      \DeclareLanguageMapping{catalan}{catalan}
+      \DeclareLanguageMapping{croatian}{croatian}
+      \DeclareLanguageMapping{english}{english}
+      \DeclareLanguageMapping{greek}{greek}
+      \DeclareLanguageMapping{icelandic}{icelandic}
+      \DeclareLanguageMapping{italian}{italian}
+      \DeclareLanguageMapping{portuguese}{portuguese}
+      \DeclareLanguageMapping{slovene}{slovene}
+      \DeclareLanguageMapping{spanish}{spanish}}
+  }
+
 \newbibmacro*{bbx:savehash}{%
   \savefield{fullhash}{\bbx@lasthash}}
 \DeclareBibliographyOption{dashed}[true]{%
@@ -255,7 +279,8 @@
   alldates=short,
   eventdate=comp,
   blockpunct=emdash,
-  doublevols=true}
+  doublevols=true,
+  otherlangs=true}
 
 \newbibmacro*{cbx:bookibid:check}[2]{#2}
 
@@ -274,50 +299,36 @@
 % volume etc
 %
 % helper for printing volume/book/number/part/issue
-\newcommand{\printvol}[2]{%
-  \ifnumcomp{\rangelen{#2}}{=}{2}
+% [prefix] <value> <volume-string>
+\newcommand{\printvol}[3][]{%
+  \ifnumcomp{\rangelen{#3}}{=}{2}
     {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
     {}%
-  \iffieldnums{#2}
-    {\ifbibstring{#2}
-      {\bibstring{#2}\addabbrvspace#1}
-      {#1}}
-    {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+  \iffieldnums{#3}
+    {\ifbibstring{#3}
+      {\bibstring{#3}\addabbrvspace#2}
+      {#1#2}}
+    {\ifcapital{\MakeCapital{#2}}{#2}\isdot}}
 \DeclareFieldFormat*{volume}{\printvol{#1}{volume}}
 \DeclareFieldFormat[article,periodical]{volume}{%
-  \ifnumcomp{\rangelen{volume}}{=}{2}
-    {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
-    {}%
+  \ifnumcomp{\rangelen{volume}}{=}{2}{%
+    \iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}%
+  }{}%
   \ifbibstring{volume}
     {\bibstring{jourvol}\addabbrvspace#1}
     {#1}}
 \DeclareFieldFormat*{book}{\printvol{#1}{book}}
 \DeclareFieldFormat*{part}{\printvol{#1}{part}}
-\DeclareFieldFormat{seriesnumber}{#1}%
-\DeclareFieldFormat*{number}{%
-  \ifnumcomp{\rangelen{number}}{=}{2}
-    {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
-    {}%
-  \iffieldnums{number}
-    {\ifbibstring{number}
-      {\bibsstring{number}\addabbrvspace#1}
-      {\unspace\adddot#1}}%
-    {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat*{issue}{\printvol{#1}{issue}}
+\DeclareFieldFormat[article,periodical]{issue}{\printvol[\unspace\adddot]{#1}{issue}}
+\DeclareFieldFormat*{number}{\printvol[\unspace\adddot]{#1}{number}}
+% \DeclareFieldFormat*{number}{\printvol{#1}{number}}
 \DeclareFieldFormat[patent]{number}{#1}%
 \DeclareFieldFormat{requestnumber}{%
   \ifbibstring{number}
     {\bibsstring{number}\addnbspace#1}
     {#1}}%
-\DeclareFieldFormat{issue}{\printvol{#1}{issue}}
-\DeclareFieldFormat[article,periodical]{issue}{%
-  \ifnumcomp{\rangelen{issue}}{=}{2}
-    {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}}
-    {}%
-  \iffieldnums{issue}
-    {\ifbibstring{issue}%
-     {\bibstring{issue}\addabbrvspace#1}%
-     {\unspace\adddot#1}}%
-    {\ifcapital{\MakeCapital{#1}}{#1}\isdot}}
+\DeclareFieldFormat{seriesnumber}{#1}%
 
 % volumes etc, involumes etc
 %  
@@ -415,7 +426,9 @@
       {\namepartgiven}
       {\namepartprefix}
       {\namepartsuffix}}%
-  \usebibmacro{name:andothers}} 
+    \iftoggle{bbx:gostbibliography}
+      {}
+      {\usebibmacro{name:andothers}}} 
 \newbibmacro*{headingname:family-given}[4]{%
   \ifuseprefix
     {\usebibmacro{name:delim}{#3#1}%
@@ -1855,7 +1868,7 @@
   \iffieldundef{issuetitle}
     {}
     {\setunit{\addcolon\space}%
-     \printfield{issuetitle}}}%
+     \printtext[issuetitle]{\printfield[titlecase]{issuetitle}}}}%
 
 \newbibmacro*{jour:date}{%
   \usebibmacro{year}%
@@ -2139,7 +2152,9 @@
   }
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
-       {\printnames[heading]{author}%
+       {\iftoggle{bbx:gostbibliography}
+         {\printnames[heading][1-1]{author}}
+         {\printnames[heading]{author}}%
      \setunit{\addcomma\space}%
      \usebibmacro{bbx:savehash}}%
      \usebibmacro{authorstrg}}