disser (5jul16)

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

2 files changed, 44 insertions, 92 deletions

diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
index 3764b36fb69..712ca4f16c0 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
@@ -69,7 +69,7 @@ ENTRY
   { label }
 
 INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.colon after.semicolon after.dash }
+after.dblslash after.slash after.colon after.semicolon }
 
 FUNCTION {init.state.consts}
 {
@@ -81,7 +81,6 @@ FUNCTION {init.state.consts}
   #5 'after.slash :=
   #6 'after.colon :=
   #7 'after.semicolon :=
-  #8 'after.dash :=
 }
 
 STRINGS { s t }
@@ -106,7 +105,8 @@ FUNCTION {output.nonnull}
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
-        { add.period$ " " * write$
+        { add.period$ write$
+          " \BibDash " write$
           newline$
           "\newblock " write$
         }
@@ -120,11 +120,7 @@ FUNCTION {output.nonnull}
                         { ": " * write$ }
                         { output.state after.semicolon =
                             { "; " * write$ }
-                            { output.state after.dash =
-                                { "~--- " * write$ }
-                                { add.period$ " " * write$ }
-                              if$
-                            }
+                            { add.period$ " " * write$ }
                           if$
                         }
                       if$
@@ -205,14 +201,6 @@ FUNCTION {new.semicolon}
   if$
 }
 
-FUNCTION {new.dash}
-{
-  output.state before.all =
-    'skip$
-    { after.dash 'output.state := }
-  if$
-}
-
 FUNCTION {new.sentence}
 {
   output.state after.block =
@@ -664,7 +652,7 @@ FUNCTION {bbl.phdthesis}
   if$
 }
 
-FUNCTION {bbl.docdisser}
+FUNCTION {bbl.dscithesis}
 {
   curlanguage "english" =
     { "Dr.\,Sci. dissertation" }
@@ -1633,14 +1621,14 @@ FUNCTION {phdthesis}
   fin.entry
 }
 
-FUNCTION {docdisser}
+FUNCTION {dscithesis}
 {
   output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi.url "title" output.check
   new.colon
-  bbl.docdisser format.thesis.type output.nonnull
+  bbl.dscithesis format.thesis.type output.nonnull
   new.slash
   school "school" output.check
   new.block
@@ -1729,7 +1717,7 @@ FUNCTION {patent}
   holder output.nonnull
   new.semicolon
   credits output.nonnull
-  new.dash
+  new.block
   reqnumber add.number output
   new.semicolon
   format.reqdate output
@@ -1943,32 +1931,20 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
-  "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi"
-  write$ newline$
-  "\ifx\undefined\href\def\href#1#2{#2}\else\fi"
-  write$ newline$
-  "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi"
-  write$ newline$
-  "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi"
-  write$ newline$
-  "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi"
-  write$ newline$
-  "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%"
-  write$ newline$
-  "\cyr\cyrd\cyra\cyrt\cyra\ %"
-  write$ newline$
-  "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi"
-  write$ newline$
-  "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi"
-  write$ newline$
-  "\begin{thebibliography}{" longest.label  * "}" *
-  write$ newline$
-  "\def\selectlanguageifdefined#1{"
-  write$ newline$
-  "\expandafter\ifx\csname date#1\endcsname\relax"
-  write$ newline$
-  "\else\language\csname l@#1\endcsname\fi}"
-  write$ newline$
+  "\providecommand*\BibEmph[1]{#1}" write$ newline$
+  "\providecommand*\BibDash{}" write$ newline$
+  "\providecommand*\href[2]{#2}" write$ newline$
+  "\providecommand*\url[1]{\texttt{#1}}" write$ newline$
+  "\providecommand*\urlprefix{URL: }" write$ newline$
+  "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$
+  "\providecommand*\BibUrlDate[1]{({%" write$ newline$
+    "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$
+    "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$
+  "\providecommand*\BibAnnote[1]{#1}" write$ newline$
+  "\begin{thebibliography}{" longest.label  * "}" * write$ newline$
+  "\def\selectlanguageifdefined#1{" write$ newline$
+    "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
+    "\else\language\csname l@#1\endcsname\fi}" write$ newline$
 }
 
 EXECUTE {begin.bib}
diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
index 69c939513e7..a9a8dbb995d 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
@@ -69,7 +69,7 @@ ENTRY
   { label }
 
 INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.colon after.semicolon after.dash }
+after.dblslash after.slash after.colon after.semicolon }
 
 FUNCTION {init.state.consts}
 {
@@ -81,7 +81,6 @@ FUNCTION {init.state.consts}
   #5 'after.slash :=
   #6 'after.colon :=
   #7 'after.semicolon :=
-  #8 'after.dash :=
 }
 
 STRINGS { s t }
@@ -106,7 +105,8 @@ FUNCTION {output.nonnull}
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
-        { add.period$ " " * write$
+        { add.period$ write$
+          " \BibDash " write$
           newline$
           "\newblock " write$
         }
@@ -120,11 +120,7 @@ FUNCTION {output.nonnull}
                         { ": " * write$ }
                         { output.state after.semicolon =
                             { "; " * write$ }
-                            { output.state after.dash =
-                                { "~--- " * write$ }
-                                { add.period$ " " * write$ }
-                              if$
-                            }
+                            { add.period$ " " * write$ }
                           if$
                         }
                       if$
@@ -205,14 +201,6 @@ FUNCTION {new.semicolon}
   if$
 }
 
-FUNCTION {new.dash}
-{
-  output.state before.all =
-    'skip$
-    { after.dash 'output.state := }
-  if$
-}
-
 FUNCTION {new.sentence}
 {
   output.state after.block =
@@ -664,7 +652,7 @@ FUNCTION {bbl.phdthesis}
   if$
 }
 
-FUNCTION {bbl.docdisser}
+FUNCTION {bbl.dscithesis}
 {
   curlanguage "english" =
     { "Dr.\,Sci. dissertation" }
@@ -1633,14 +1621,14 @@ FUNCTION {phdthesis}
   fin.entry
 }
 
-FUNCTION {docdisser}
+FUNCTION {dscithesis}
 {
   output.bibitem
   format.authors "author" output.check
   new.sentence
   format.btitle add.doi.url "title" output.check
   new.colon
-  bbl.docdisser format.thesis.type output.nonnull
+  bbl.dscithesis format.thesis.type output.nonnull
   new.slash
   school "school" output.check
   new.block
@@ -1729,7 +1717,7 @@ FUNCTION {patent}
   holder output.nonnull
   new.semicolon
   credits output.nonnull
-  new.dash
+  new.block
   reqnumber add.number output
   new.semicolon
   format.reqdate output
@@ -2046,32 +2034,20 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
-  "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi"
-  write$ newline$
-  "\ifx\undefined\href\def\href#1#2{#2}\else\fi"
-  write$ newline$
-  "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi"
-  write$ newline$
-  "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi"
-  write$ newline$
-  "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi"
-  write$ newline$
-  "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%"
-  write$ newline$
-  "\cyr\cyrd\cyra\cyrt\cyra\ %"
-  write$ newline$
-  "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi"
-  write$ newline$
-  "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi"
-  write$ newline$
-  "\begin{thebibliography}{" longest.label  * "}" *
-  write$ newline$
-  "\def\selectlanguageifdefined#1{"
-  write$ newline$
-  "\expandafter\ifx\csname date#1\endcsname\relax"
-  write$ newline$
-  "\else\language\csname l@#1\endcsname\fi}"
-  write$ newline$
+  "\providecommand*\BibEmph[1]{#1}" write$ newline$
+  "\providecommand*\BibDash{}" write$ newline$
+  "\providecommand*\href[2]{#2}" write$ newline$
+  "\providecommand*\url[1]{\texttt{#1}}" write$ newline$
+  "\providecommand*\urlprefix{URL: }" write$ newline$
+  "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$
+  "\providecommand*\BibUrlDate[1]{({%" write$ newline$
+    "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$
+    "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$
+  "\providecommand*\BibAnnote[1]{#1}" write$ newline$
+  "\begin{thebibliography}{" longest.label  * "}" * write$ newline$
+  "\def\selectlanguageifdefined#1{" write$ newline$
+    "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
+    "\else\language\csname l@#1\endcsname\fi}" write$ newline$
 }
 
 EXECUTE {begin.bib}