disser (21dec11)

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

1 files changed, 155 insertions, 66 deletions

diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
index ff41304025c..a4fa5ea1f5f 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
@@ -286,11 +286,15 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
 {
   curlanguage "english" =
   { "Ed. by " }
-    { curlanguage "russian" =
-        { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
-        { "language is not defined: " language  "edited by" * *
-          warning$ "edited by" }
-      if$
+   { curlanguage "german" =
+     { "ed. " }
+       { curlanguage "russian" =
+         { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
+         { "language is not defined: " language  "edited by" * *
+           warning$ "edited by" }
+     if$
+     }
+    if$
     }
   if$
 }
@@ -299,22 +303,30 @@ FUNCTION {bbl.cmplr}
 {
   curlanguage "english" =
   { "Compiler " }
-    { curlanguage "russian" =
+   { curlanguage "german" =
+    { "Hrsg. " }
+     { curlanguage "russian" =
       { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" }
       { "language is not defined: " language  "compiler" * * warning$ "compiler" }
     if$
-    }
+     }
+   if$
+   }
   if$
 }
 
 FUNCTION {bbl.edition} % { "\bbledition{}" }
 {
   curlanguage "english" =
-    { "edition" }
-    { curlanguage "russian" =
-       { "{\cyr\cyri\cyrz\cyrd.}" }
-       { "language is not defined: " language  "edition" * * warning$ "edition" }
-     if$
+   { "edition" }
+   { curlanguage "german" =
+     { "Aufl." }
+       { curlanguage "russian" =
+         { "{\cyr\cyri\cyrz\cyrd.}" }
+         { "language is not defined: " language  "edition" * * warning$ "edition" }
+       if$
+      }
+    if$
     }
   if$
 }
@@ -323,9 +335,13 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
 {
   curlanguage "english" =
     { "Volume" }
-    { curlanguage "russian" =
-      { "{\cyr\CYRT\cyro\cyrm}" }
-      { "language is not defined: " language  "Volume" * * warning$ "Volume" }
+    { curlanguage "german" =
+      { "Band" }
+      { curlanguage "russian" =
+        { "{\cyr\CYRT\cyro\cyrm}" }
+        { "language is not defined: " language  "Volume" * * warning$ "Volume" }
+      if$
+      }
     if$
     }
   if$
@@ -335,10 +351,14 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" }
 {
   curlanguage "english" =
     { "Vol." }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Bd." }
+      { curlanguage "russian" =
         { "{\cyr\CYRT.}" }
         { "language is not defined: " language  "Vol." * * warning$ "Vol." }
-      if$
+        if$
+      }
+    if$
     }
   if$
 }
@@ -347,10 +367,14 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
 {
   curlanguage "english" =
     { "Issue" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Heft" }
+      { curlanguage "russian" =
         { "{\cyr\CYRV\cyrery\cyrp\cyru\cyrs\cyrk}" }
         { "language is not defined: " language * warning$ "Issue" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -359,10 +383,14 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
 {
   curlanguage "english" =
     { "Iss." }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "H." }
+      { curlanguage "russian" =
         { "{\cyr\CYRV\cyrery\cyrp.}" }
-        { "language is not defined: " language * warning$ "Issue" }
+        { "language is not defined: " language * warning$ "Iss." }
       if$
+      }
+    if$
     }
   if$
 }
@@ -371,10 +399,14 @@ FUNCTION {bbl.of} % { "\bblof{}" }
 {
   curlanguage "english" =
     { "of" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "von" }
+      { curlanguage "russian" =
         { "{\cyr\cyri\cyrz}" }
-        { "language is not defined: " language "of" *  * warning$ "of" }
+        { "language is not defined: " language * warning$ "of" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -383,11 +415,15 @@ FUNCTION {bbl.etal} % { "\bblof{}" }
 {
   curlanguage "english" =
     { "et~al." }
-    { curlanguage "russian" =
-         { "{\cyr\cyri~\cyrd\cyrr.}" }
-         { "language is not defined: " language  "at al" * * warning$ "at al." }
-       if$
-     }
+    { curlanguage "german" =
+      { "u.~a." }
+      { curlanguage "russian" =
+        { "{\cyr\cyri~\cyrd\cyrr.}" }
+        { "language is not defined: " language * warning$ "etal" }
+      if$
+      }
+    if$
+    }
   if$
 }
 
@@ -395,10 +431,14 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
 {
   curlanguage "english" =
     { "Number" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Heft" }
+      { curlanguage "russian" =
         { "{\cyr\CYRN\cyro\cyrm\cyre\cyrr}" }
-        { "language is not defined: " language  "Number" * * warning$ "Number" }
+        { "language is not defined: " language * warning$ "Number" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -407,10 +447,14 @@ FUNCTION {bbl.number} % { "\bblnumber{}" }
 {
   curlanguage "english" =
     { "number" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Heft" }
+      { curlanguage "russian" =
         { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}" }
-        { "language is not defined: " language  "number" * * warning$ "number" }
+        { "language is not defined: " language * warning$ "number" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -419,10 +463,14 @@ FUNCTION {bbl.nr} % { "\bblno{}" }
 {
   curlanguage "english" =
     { "no." }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "H." }
+      { curlanguage "russian" =
         { "{\cyr\textnumero}" }
-        { "language is not defined: " language  "no." * * warning$ "no." }
+        { "language is not defined: " language * warning$ "no" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -430,11 +478,15 @@ FUNCTION {bbl.nr} % { "\bblno{}" }
 FUNCTION {bbl.nnr} % { "\bblno{}" }
 {
   curlanguage "english" =
-  { "No." }
-    { curlanguage "russian" =
+    { "No." }
+    { curlanguage "german" =
+      { "H." }
+      { curlanguage "russian" =
         { "{\cyr\textnumero}" }
-        { "language is not defined: " language  "No." * * warning$ "No." }
+        { "language is not defined: " language * warning$ "No" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -443,10 +495,14 @@ FUNCTION {bbl.in} % { "\bblin{}" }
 {
   curlanguage "english" =
     { "in" }
+    { curlanguage "german" =
+      { "in" }
     { curlanguage "russian" =
-        { "{\cyr\cyrv}" }
-        { "language is not defined: " language  "in" * * warning$ "in" }
+      { "{\cyr\cyrv}" }
+      { "language is not defined: " language * warning$ "in" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -454,11 +510,15 @@ FUNCTION {bbl.in} % { "\bblin{}" }
 FUNCTION {bbl.iin} % { "\bblIn{}" }
 {
   curlanguage "english" =
-  { "In" }
-    { curlanguage "russian" =
+    { "In" }
+    { curlanguage "german" =
+      { "In" }
+      { curlanguage "russian" =
         { "{\cyr\CYRV}" }
-        { "language is not defined: " language  "In" * * warning$ "In" }
+        { "language is not defined: " language * warning$ "In" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -466,11 +526,15 @@ FUNCTION {bbl.iin} % { "\bblIn{}" }
 FUNCTION {bbl.pages} % { "\bblpp." }
 {
   curlanguage "english" =
-    { "pp." }
-    { curlanguage "russian" =
+    { "p." }
+    { curlanguage "german" =
+      { "S." }
+      { curlanguage "russian" =
         { "{\cyr\cyrs.}" }
-        { "language is not defined: " language  "pp." * * warning$ "pp." }
+        { "language is not defined: " language * warning$ "p." }
       if$
+      }
+    if$
     }
   if$
 }
@@ -479,10 +543,14 @@ FUNCTION {bbl.page} % { "\bblp." }
 {
   curlanguage "english" =
     { "p." }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "S." }
+      { curlanguage "russian" =
         { "{\cyr\cyrs.}"}
-        { "language is not defined: " language  "p." * * warning$ "p." }
+        { "language is not defined: " language * warning$ "p." }
       if$
+      }
+    if$
     }
   if$
 }
@@ -490,11 +558,15 @@ FUNCTION {bbl.page} % { "\bblp." }
 FUNCTION {bbl.ppages} % { "\bblPp." }
 {
   curlanguage "english" =
-    { "Pp." }
-    { curlanguage "russian" =
+    { "P." }
+    { curlanguage "german" =
+      { "S." }
+      { curlanguage "russian" =
         { "{\cyr\CYRS.}" }
-        { "language is not defined: " language  "Pp." * * warning$ "Pp." }
-     if$
+        { "language is not defined: " language * warning$ "P." }
+      if$
+      }
+    if$
     }
   if$
 }
@@ -503,10 +575,14 @@ FUNCTION {bbl.ppage} % { "\bblP." }
 {
   curlanguage "english" =
     { "P." }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "S." }
+      { curlanguage "russian" =
         { "{\cyr\CYRS.}" }
-        { "language is not defined: " language  "P." * * warning$ "P." }
+        { "language is not defined: " language * warning$ "P." }
       if$
+      }
+    if$
     }
   if$
 }
@@ -514,11 +590,15 @@ FUNCTION {bbl.ppage} % { "\bblP." }
 FUNCTION {bbl.techrep}
 {
   curlanguage "english" =
-    { "Tech. Rep." }
-    { curlanguage "russian" =
+    { "Tech.~Rep." }
+    { curlanguage "german" =
+      { "Tech.~Bericht" }
+      { curlanguage "russian" =
         { "{\cyr\CYRT\cyre\cyrh.\ \cyrd\cyro\cyrk\cyrl\cyra\cyrd.}" }
-        { "language is not defined: " language  "Tech. Rep." * * warning$ "P." }
+        { "language is not defined: " language * warning$ "Tech Rep" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -527,11 +607,15 @@ FUNCTION {bbl.mthesis}
 {
   curlanguage "english" =
     { "Master's thesis" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Diss.~Mag." }
+      { curlanguage "russian" =
         { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ "
           "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
-        { "language is not defined: " language  "Master's thesis" * * warning$ "P." }
+         { "language is not defined: " language * warning$ "In" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -540,11 +624,15 @@ FUNCTION {bbl.phdthesis}
 {
   curlanguage "english" =
     { "Ph.\,D. thesis" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Diss.~Ph.\,D." }
+      { curlanguage "russian" =
         { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ "
           "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
-        { "language is not defined: " language  "Ph.\,D. thesis" * * warning$ "P." }
+        { "language is not defined: " language * warning$ "In" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -553,12 +641,15 @@ FUNCTION {bbl.docdisser}
 {
   curlanguage "english" =
     { "Dr.\,Sci. dissertation" }
-    { curlanguage "russian" =
+    { curlanguage "german" =
+      { "Diss.~Dr." }
+      { curlanguage "russian" =
         { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ "
           "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
-        { "language is not defined: " language  "Dr.\,Sci. dissertation" * *
-          warning$ "P." }
+        { "language is not defined: " language * warning$ "In" }
       if$
+      }
+    if$
     }
   if$
 }
@@ -813,8 +904,8 @@ FUNCTION {format.number.series}
               bbl.nnr
             }
             { new.sentence
-              series
-              bbl.nr
+              bbl.iiss series tie.or.space.connect
+              ", " * bbl.nr
               tie.or.space.connect
             }
           if$
@@ -1779,8 +1870,6 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
-  "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother"
-  write$ newline$
   "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi"
   write$ newline$
   "\ifx\undefined\href\def\href#1#2{#2}\else\fi"