disser (30dec13)

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

2 files changed, 466 insertions, 114 deletions

diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
index f6306837ade..3764b36fb69 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
@@ -6,7 +6,7 @@
 %%
 %% gost705.dtx  (with options: `gost705')
 %% 
-%% Copyright (c) 2004-2010 Stanislav Kruchinin.
+%% Copyright (c) 2004-2014 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -50,12 +50,26 @@ ENTRY
     archivePrefix
     primaryClass
     eprint
+    authortype
+    media
+    location
+    ipc
+    holder
+    credits
+    reqnumber
+    reqdate
+    pubdate
+    publication
+    prdate
+    prnumber
+    prcountry
+    pagetotal
   }
   {}
   { label }
 
 INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon after.dash }
 
 FUNCTION {init.state.consts}
 {
@@ -65,8 +79,9 @@ FUNCTION {init.state.consts}
   #3 'after.block :=
   #4 'after.dblslash :=
   #5 'after.slash :=
-  #6 'after.column :=
-  #7 'after.semicolumn :=
+  #6 'after.colon :=
+  #7 'after.semicolon :=
+  #8 'after.dash :=
 }
 
 STRINGS { s t }
@@ -101,11 +116,15 @@ FUNCTION {output.nonnull}
                 { "~//" * change.language * " " * write$ }
                 { output.state after.slash =
                     { "~/ " * write$ }
-                    { output.state after.column =
+                    { output.state after.colon =
                         { ": " * write$ }
-                        { output.state after.semicolumn =
+                        { output.state after.semicolon =
                             { "; " * write$ }
-                            { add.period$ " " * write$ }
+                            { output.state after.dash =
+                                { "~--- " * write$ }
+                                { add.period$ " " * write$ }
+                              if$
+                            }
                           if$
                         }
                       if$
@@ -170,19 +189,27 @@ FUNCTION {new.slash}
   if$
 }
 
-FUNCTION {new.column}
+FUNCTION {new.colon}
 {
   output.state before.all =
     'skip$
-    { after.column 'output.state := }
+    { after.colon 'output.state := }
   if$
 }
 
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
 {
   output.state before.all =
     'skip$
-    { after.semicolumn 'output.state := }
+    { after.semicolon 'output.state := }
+  if$
+}
+
+FUNCTION {new.dash}
+{
+  output.state before.all =
+    'skip$
+    { after.dash 'output.state := }
   if$
 }
 
@@ -286,14 +313,14 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
 {
   curlanguage "english" =
   { "Ed. by " }
-   { curlanguage "german" =
-     { "ed. " }
-       { curlanguage "russian" =
-         { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
-         { "language is not defined: " language  "edited by" * *
+    { 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$
     }
   if$
@@ -303,15 +330,15 @@ FUNCTION {bbl.cmplr}
 {
   curlanguage "english" =
   { "Compiler " }
-   { curlanguage "german" =
-    { "Hrsg. " }
-     { curlanguage "russian" =
-      { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" }
-      { "language is not defined: " language  "compiler" * * warning$ "compiler" }
+    { curlanguage "german" =
+      { "Hrsg. " }
+        { curlanguage "russian" =
+        { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" }
+        { "language is not defined: " language  "compiler" * * warning$ "compiler" }
+      if$
+      }
     if$
-     }
-   if$
-   }
+    }
   if$
 }
 
@@ -612,7 +639,7 @@ FUNCTION {bbl.mthesis}
       { 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 * warning$ "In" }
+         { "language is not defined: " language * warning$ "Master thesis" }
       if$
       }
     if$
@@ -629,7 +656,7 @@ FUNCTION {bbl.phdthesis}
       { 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 * warning$ "In" }
+        { "language is not defined: " language * warning$ "PhD thesis" }
       if$
       }
     if$
@@ -646,6 +673,54 @@ FUNCTION {bbl.docdisser}
       { 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 * warning$ "Dr. Sci. dissertation" }
+      if$
+      }
+    if$
+    }
+  if$
+}
+
+FUNCTION {bbl.req}
+{
+  curlanguage "english" =
+    { "req." }
+    { curlanguage "german" =
+      { "ang." }
+      { curlanguage "russian" =
+        { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+        { "language is not defined: " language * warning$ "req" }
+      if$
+      }
+    if$
+    }
+  if$
+}
+
+FUNCTION {bbl.publ}
+{
+  curlanguage "english" =
+    { "publ." }
+    { curlanguage "german" =
+      { "ausg." }
+      { curlanguage "russian" =
+        { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+        { "language is not defined: " language * warning$ "In" }
+      if$
+      }
+    if$
+    }
+  if$
+}
+
+FUNCTION {bbl.prio}
+{
+  curlanguage "english" =
+    { "priority" }
+    { curlanguage "german" =
+      { "Prioritat" }
+      { curlanguage "russian" =
+        { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
         { "language is not defined: " language * warning$ "In" }
       if$
       }
@@ -805,7 +880,7 @@ FUNCTION {output.address.publisher.date}
     { address output
       publisher empty$
         'skip$
-        { new.column }
+        { new.colon }
       if$
     }
   if$
@@ -1035,8 +1110,7 @@ FUNCTION {format.volume}
 }
 
 FUNCTION {format.number}
-{
-  number empty$
+{ number empty$
     { "" }
     { bbl.nr number tie.or.space.connect }
   if$
@@ -1101,7 +1175,7 @@ FUNCTION {author.after}
     'skip$
     { author num.names$ #3 >
       { format.authors.after output
-        new.semicolumn
+        new.semicolon
       }
       'skip$
     if$
@@ -1115,7 +1189,7 @@ FUNCTION {bookauthor.after}
     'skip$
     { bookauthor num.names$ #3 >
       { format.bookauthors.after output
-        new.semicolumn
+        new.semicolon
       }
       'skip$
     if$
@@ -1128,19 +1202,19 @@ FUNCTION {editor.organization.after}
   compiler empty$
     'skip$
     { format.compiler.after output
-      new.semicolumn
+      new.semicolon
     }
   if$
   editor empty$
     'skip$
     { format.editors.after output
-      new.semicolumn
+      new.semicolon
     }
   if$
   organization empty$
     'skip$
     { organization output
-      new.semicolumn
+      new.semicolon
     }
   if$
 }
@@ -1193,12 +1267,16 @@ FUNCTION {format.isbn}
   if$
 }
 
-FUNCTION {add.doi}
+FUNCTION {add.doi.url}
 { duplicate$ empty$
     'skip$
     { doi empty$
-        'skip$
-        { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+      { url empty$
+          'skip$
+          { "\href{" url * "}{" * swap$ * "}" * }
+        if$
+      }
+      { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
       if$
     }
   if$
@@ -1216,12 +1294,69 @@ FUNCTION {format.eprint}
              "{" * primaryClass * "/" * eprint * "}" *
             }
             { " \href{http://arxiv.org/abs/" eprint * "}" *
-             "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" *
+           "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" *
             }
           if$
         }
-   if$
+     if$
+    }
+  if$
+}
+
+FUNCTION {add.number}
+{ duplicate$ empty$
+    { "" }
+    { bbl.nr swap$ tie.or.space.connect }
+  if$
+}
+
+FUNCTION {in.square.brackets}
+{
+  duplicate$ empty$
+    { pop$ "" }
+    { "[" swap$ * "]" * }
+  if$
+}
+
+FUNCTION {in.round.brackets}
+{
+  duplicate$ empty$
+    { pop$ "" }
+    { "(" swap$ * ")" * }
+  if$
+}
+
+FUNCTION {format.type.number}
+{
+  type empty$
+    { "" }
+    {
+      number empty$
+      { "" }
+      { type number tie.or.space.connect }
+    if$
+    }
+  if$
+}
+
+FUNCTION {format.reqdate}
+{ reqdate empty$
+    { "" }
+    { bbl.req reqdate tie.or.space.connect }
+  if$
 }
+
+FUNCTION {format.pubdate}
+{ pubdate empty$
+    { "" }
+    { bbl.publ pubdate tie.or.space.connect }
+  if$
+}
+
+FUNCTION {format.prdate}
+{ prdate empty$
+    { "" }
+    { bbl.prio prdate tie.or.space.connect }
   if$
 }
 
@@ -1231,7 +1366,7 @@ FUNCTION {article}
   author.before
   format.title "title" output.check
   new.dblslash
-  journal emphasize add.doi "journal" output.check
+  journal emphasize add.doi.url "journal" output.check
   new.block
   format.date output
   new.block
@@ -1253,7 +1388,7 @@ FUNCTION {book}
 {
   output.bibitem
   author.before
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.slash
   editor.organization.after
   new.sentence
@@ -1302,7 +1437,7 @@ FUNCTION {inbook}
 {
   output.bibitem
   author.before
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.dblslash
   bookauthor.before
   booktitle "booktitle" output.check
@@ -1334,7 +1469,7 @@ FUNCTION {incollection}
   output.bibitem
   author.before
   new.sentence
-  format.title add.doi "title" output.check
+  format.title add.doi.url "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1361,7 +1496,7 @@ FUNCTION {inproceedings}
   output.bibitem
   author.before
   new.sentence
-  format.title add.doi "title" output.check
+  format.title add.doi.url "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1375,7 +1510,7 @@ FUNCTION {inproceedings}
       format.date "year" output.check
     }
     { address output.nonnull
-      new.column
+      new.colon
       publisher output
       format.date "year" output.check
     }
@@ -1439,7 +1574,7 @@ FUNCTION {mastersthesis}
   output.bibitem
   format.authors "author" output.check
   new.block
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.block
   bbl.mthesis format.thesis.type output.nonnull
   school "school" output.check
@@ -1480,8 +1615,8 @@ FUNCTION {phdthesis}
   output.bibitem
   format.authors "author" output.check
   new.sentence
-  format.btitle add.doi "title" output.check
-  new.column
+  format.btitle add.doi.url "title" output.check
+  new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
   school "school" output.check
@@ -1503,8 +1638,8 @@ FUNCTION {docdisser}
   output.bibitem
   format.authors "author" output.check
   new.sentence
-  format.btitle add.doi "title" output.check
-  new.column
+  format.btitle add.doi.url "title" output.check
+  new.colon
   bbl.docdisser format.thesis.type output.nonnull
   new.slash
   school "school" output.check
@@ -1524,7 +1659,7 @@ FUNCTION {docdisser}
 FUNCTION {proceedings}
 {
   output.bibitem
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.slash
   editor.organization.after
   new.block
@@ -1555,13 +1690,13 @@ FUNCTION {techreport}
   output.bibitem
   author.before
   new.sentence
-  format.title add.doi "title" output.check
-  new.column
+  format.title add.doi.url "title" output.check
+  new.colon
   format.tr.number output.nonnull
   editor.organization.after
   new.block
   address output
-  new.column
+  new.colon
   institution "institution" output.check
   format.date "year" output.check
   new.block
@@ -1574,11 +1709,52 @@ FUNCTION {techreport}
   fin.entry
 }
 
+FUNCTION {patent}
+{
+  output.bibitem
+  title output.nonnull
+  add.blank
+  media in.square.brackets output
+  new.colon
+  format.type.number output
+  add.blank
+  location output
+  new.colon
+  ipc output
+  new.slash
+  format.authors.after "author" output.check
+  add.blank
+  authortype in.round.brackets output.nonnull
+  new.semicolon
+  holder output.nonnull
+  new.semicolon
+  credits output.nonnull
+  new.dash
+  reqnumber add.number output
+  new.semicolon
+  format.reqdate output
+  new.semicolon
+  format.pubdate output
+  publication output
+  new.semicolon
+  format.prdate output
+  prnumber output
+  prcountry in.round.brackets output
+  new.block
+  note output
+  new.sentence
+  output.url
+  format.annote output
+  new.block
+  pagetotal output
+  fin.entry
+}
+
 FUNCTION {unpublished}
 {
   output.bibitem
   author.before
-  format.btitle "title" output.check
+  format.btitle add.doi.url "title" output.check
   editor.organization.after
   new.block
   note "note" output.check
diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
index a4fa5ea1f5f..69c939513e7 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
@@ -6,7 +6,7 @@
 %%
 %% gost705.dtx  (with options: `gost705s')
 %% 
-%% Copyright (c) 2004-2010 Stanislav Kruchinin.
+%% Copyright (c) 2004-2014 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -50,12 +50,26 @@ ENTRY
     archivePrefix
     primaryClass
     eprint
+    authortype
+    media
+    location
+    ipc
+    holder
+    credits
+    reqnumber
+    reqdate
+    pubdate
+    publication
+    prdate
+    prnumber
+    prcountry
+    pagetotal
   }
   {}
   { label }
 
 INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.column after.semicolumn }
+after.dblslash after.slash after.colon after.semicolon after.dash }
 
 FUNCTION {init.state.consts}
 {
@@ -65,8 +79,9 @@ FUNCTION {init.state.consts}
   #3 'after.block :=
   #4 'after.dblslash :=
   #5 'after.slash :=
-  #6 'after.column :=
-  #7 'after.semicolumn :=
+  #6 'after.colon :=
+  #7 'after.semicolon :=
+  #8 'after.dash :=
 }
 
 STRINGS { s t }
@@ -101,11 +116,15 @@ FUNCTION {output.nonnull}
                 { "~//" * change.language * " " * write$ }
                 { output.state after.slash =
                     { "~/ " * write$ }
-                    { output.state after.column =
+                    { output.state after.colon =
                         { ": " * write$ }
-                        { output.state after.semicolumn =
+                        { output.state after.semicolon =
                             { "; " * write$ }
-                            { add.period$ " " * write$ }
+                            { output.state after.dash =
+                                { "~--- " * write$ }
+                                { add.period$ " " * write$ }
+                              if$
+                            }
                           if$
                         }
                       if$
@@ -170,19 +189,27 @@ FUNCTION {new.slash}
   if$
 }
 
-FUNCTION {new.column}
+FUNCTION {new.colon}
 {
   output.state before.all =
     'skip$
-    { after.column 'output.state := }
+    { after.colon 'output.state := }
   if$
 }
 
-FUNCTION {new.semicolumn}
+FUNCTION {new.semicolon}
 {
   output.state before.all =
     'skip$
-    { after.semicolumn 'output.state := }
+    { after.semicolon 'output.state := }
+  if$
+}
+
+FUNCTION {new.dash}
+{
+  output.state before.all =
+    'skip$
+    { after.dash 'output.state := }
   if$
 }
 
@@ -286,14 +313,14 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
 {
   curlanguage "english" =
   { "Ed. by " }
-   { curlanguage "german" =
-     { "ed. " }
-       { curlanguage "russian" =
-         { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
-         { "language is not defined: " language  "edited by" * *
+    { 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$
     }
   if$
@@ -303,15 +330,15 @@ FUNCTION {bbl.cmplr}
 {
   curlanguage "english" =
   { "Compiler " }
-   { curlanguage "german" =
-    { "Hrsg. " }
-     { curlanguage "russian" =
-      { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" }
-      { "language is not defined: " language  "compiler" * * warning$ "compiler" }
+    { curlanguage "german" =
+      { "Hrsg. " }
+        { curlanguage "russian" =
+        { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" }
+        { "language is not defined: " language  "compiler" * * warning$ "compiler" }
+      if$
+      }
     if$
-     }
-   if$
-   }
+    }
   if$
 }
 
@@ -612,7 +639,7 @@ FUNCTION {bbl.mthesis}
       { 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 * warning$ "In" }
+         { "language is not defined: " language * warning$ "Master thesis" }
       if$
       }
     if$
@@ -629,7 +656,7 @@ FUNCTION {bbl.phdthesis}
       { 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 * warning$ "In" }
+        { "language is not defined: " language * warning$ "PhD thesis" }
       if$
       }
     if$
@@ -646,6 +673,54 @@ FUNCTION {bbl.docdisser}
       { 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 * warning$ "Dr. Sci. dissertation" }
+      if$
+      }
+    if$
+    }
+  if$
+}
+
+FUNCTION {bbl.req}
+{
+  curlanguage "english" =
+    { "req." }
+    { curlanguage "german" =
+      { "ang." }
+      { curlanguage "russian" =
+        { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
+        { "language is not defined: " language * warning$ "req" }
+      if$
+      }
+    if$
+    }
+  if$
+}
+
+FUNCTION {bbl.publ}
+{
+  curlanguage "english" =
+    { "publ." }
+    { curlanguage "german" =
+      { "ausg." }
+      { curlanguage "russian" =
+        { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
+        { "language is not defined: " language * warning$ "In" }
+      if$
+      }
+    if$
+    }
+  if$
+}
+
+FUNCTION {bbl.prio}
+{
+  curlanguage "english" =
+    { "priority" }
+    { curlanguage "german" =
+      { "Prioritat" }
+      { curlanguage "russian" =
+        { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
         { "language is not defined: " language * warning$ "In" }
       if$
       }
@@ -805,7 +880,7 @@ FUNCTION {output.address.publisher.date}
     { address output
       publisher empty$
         'skip$
-        { new.column }
+        { new.colon }
       if$
     }
   if$
@@ -1035,8 +1110,7 @@ FUNCTION {format.volume}
 }
 
 FUNCTION {format.number}
-{
-  number empty$
+{ number empty$
     { "" }
     { bbl.nr number tie.or.space.connect }
   if$
@@ -1101,7 +1175,7 @@ FUNCTION {author.after}
     'skip$
     { author num.names$ #3 >
       { format.authors.after output
-        new.semicolumn
+        new.semicolon
       }
       'skip$
     if$
@@ -1115,7 +1189,7 @@ FUNCTION {bookauthor.after}
     'skip$
     { bookauthor num.names$ #3 >
       { format.bookauthors.after output
-        new.semicolumn
+        new.semicolon
       }
       'skip$
     if$
@@ -1128,19 +1202,19 @@ FUNCTION {editor.organization.after}
   compiler empty$
     'skip$
     { format.compiler.after output
-      new.semicolumn
+      new.semicolon
     }
   if$
   editor empty$
     'skip$
     { format.editors.after output
-      new.semicolumn
+      new.semicolon
     }
   if$
   organization empty$
     'skip$
     { organization output
-      new.semicolumn
+      new.semicolon
     }
   if$
 }
@@ -1193,12 +1267,16 @@ FUNCTION {format.isbn}
   if$
 }
 
-FUNCTION {add.doi}
+FUNCTION {add.doi.url}
 { duplicate$ empty$
     'skip$
     { doi empty$
-        'skip$
-        { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+      { url empty$
+          'skip$
+          { "\href{" url * "}{" * swap$ * "}" * }
+        if$
+      }
+      { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
       if$
     }
   if$
@@ -1216,12 +1294,69 @@ FUNCTION {format.eprint}
              "{" * primaryClass * "/" * eprint * "}" *
             }
             { " \href{http://arxiv.org/abs/" eprint * "}" *
-             "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" *
+           "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" *
             }
           if$
         }
-   if$
+     if$
+    }
+  if$
+}
+
+FUNCTION {add.number}
+{ duplicate$ empty$
+    { "" }
+    { bbl.nr swap$ tie.or.space.connect }
+  if$
+}
+
+FUNCTION {in.square.brackets}
+{
+  duplicate$ empty$
+    { pop$ "" }
+    { "[" swap$ * "]" * }
+  if$
+}
+
+FUNCTION {in.round.brackets}
+{
+  duplicate$ empty$
+    { pop$ "" }
+    { "(" swap$ * ")" * }
+  if$
+}
+
+FUNCTION {format.type.number}
+{
+  type empty$
+    { "" }
+    {
+      number empty$
+      { "" }
+      { type number tie.or.space.connect }
+    if$
+    }
+  if$
+}
+
+FUNCTION {format.reqdate}
+{ reqdate empty$
+    { "" }
+    { bbl.req reqdate tie.or.space.connect }
+  if$
 }
+
+FUNCTION {format.pubdate}
+{ pubdate empty$
+    { "" }
+    { bbl.publ pubdate tie.or.space.connect }
+  if$
+}
+
+FUNCTION {format.prdate}
+{ prdate empty$
+    { "" }
+    { bbl.prio prdate tie.or.space.connect }
   if$
 }
 
@@ -1231,7 +1366,7 @@ FUNCTION {article}
   author.before
   format.title "title" output.check
   new.dblslash
-  journal emphasize add.doi "journal" output.check
+  journal emphasize add.doi.url "journal" output.check
   new.block
   format.date output
   new.block
@@ -1253,7 +1388,7 @@ FUNCTION {book}
 {
   output.bibitem
   author.before
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.slash
   editor.organization.after
   new.sentence
@@ -1302,7 +1437,7 @@ FUNCTION {inbook}
 {
   output.bibitem
   author.before
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.dblslash
   bookauthor.before
   booktitle "booktitle" output.check
@@ -1334,7 +1469,7 @@ FUNCTION {incollection}
   output.bibitem
   author.before
   new.sentence
-  format.title add.doi "title" output.check
+  format.title add.doi.url "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1361,7 +1496,7 @@ FUNCTION {inproceedings}
   output.bibitem
   author.before
   new.sentence
-  format.title add.doi "title" output.check
+  format.title add.doi.url "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1375,7 +1510,7 @@ FUNCTION {inproceedings}
       format.date "year" output.check
     }
     { address output.nonnull
-      new.column
+      new.colon
       publisher output
       format.date "year" output.check
     }
@@ -1439,7 +1574,7 @@ FUNCTION {mastersthesis}
   output.bibitem
   format.authors "author" output.check
   new.block
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.block
   bbl.mthesis format.thesis.type output.nonnull
   school "school" output.check
@@ -1480,8 +1615,8 @@ FUNCTION {phdthesis}
   output.bibitem
   format.authors "author" output.check
   new.sentence
-  format.btitle add.doi "title" output.check
-  new.column
+  format.btitle add.doi.url "title" output.check
+  new.colon
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
   school "school" output.check
@@ -1503,8 +1638,8 @@ FUNCTION {docdisser}
   output.bibitem
   format.authors "author" output.check
   new.sentence
-  format.btitle add.doi "title" output.check
-  new.column
+  format.btitle add.doi.url "title" output.check
+  new.colon
   bbl.docdisser format.thesis.type output.nonnull
   new.slash
   school "school" output.check
@@ -1524,7 +1659,7 @@ FUNCTION {docdisser}
 FUNCTION {proceedings}
 {
   output.bibitem
-  format.btitle add.doi "title" output.check
+  format.btitle add.doi.url "title" output.check
   new.slash
   editor.organization.after
   new.block
@@ -1555,13 +1690,13 @@ FUNCTION {techreport}
   output.bibitem
   author.before
   new.sentence
-  format.title add.doi "title" output.check
-  new.column
+  format.title add.doi.url "title" output.check
+  new.colon
   format.tr.number output.nonnull
   editor.organization.after
   new.block
   address output
-  new.column
+  new.colon
   institution "institution" output.check
   format.date "year" output.check
   new.block
@@ -1574,11 +1709,52 @@ FUNCTION {techreport}
   fin.entry
 }
 
+FUNCTION {patent}
+{
+  output.bibitem
+  title output.nonnull
+  add.blank
+  media in.square.brackets output
+  new.colon
+  format.type.number output
+  add.blank
+  location output
+  new.colon
+  ipc output
+  new.slash
+  format.authors.after "author" output.check
+  add.blank
+  authortype in.round.brackets output.nonnull
+  new.semicolon
+  holder output.nonnull
+  new.semicolon
+  credits output.nonnull
+  new.dash
+  reqnumber add.number output
+  new.semicolon
+  format.reqdate output
+  new.semicolon
+  format.pubdate output
+  publication output
+  new.semicolon
+  format.prdate output
+  prnumber output
+  prcountry in.round.brackets output
+  new.block
+  note output
+  new.sentence
+  output.url
+  format.annote output
+  new.block
+  pagetotal output
+  fin.entry
+}
+
 FUNCTION {unpublished}
 {
   output.bibitem
   author.before
-  format.btitle "title" output.check
+  format.btitle add.doi.url "title" output.check
   editor.organization.after
   new.block
   note "note" output.check