disser 1.1.5 (28mar10)

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

2 files changed, 358 insertions, 186 deletions

diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
index 5f732e239fb..e5ec00223c9 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
@@ -66,6 +66,8 @@ ENTRY
     booklanguage
     url
     urldate
+    isbn
+    doi
   }
   {}
   { label }
@@ -304,7 +306,8 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
   { "Ed. by " }
     { curlanguage "russian" =
         { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
-        { "language is not defined: " language  "edited by" * * warning$ "edited by" }
+        { "language is not defined: " language  "edited by" * *
+          warning$ "edited by" }
       if$
     }
   if$
@@ -373,7 +376,7 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
 FUNCTION {bbl.iiss} % { "\bblIss{}" }
 {
   curlanguage "english" =
-    {"Iss."}
+    { "Iss." }
     { curlanguage "russian" =
         { "{\cyr\CYRV\cyrery\cyrp.}" }
         { "language is not defined: " language * warning$ "Issue" }
@@ -385,7 +388,7 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
 FUNCTION {bbl.of} % { "\bblof{}" }
 {
   curlanguage "english" =
-    {"of"}
+    { "of" }
     { curlanguage "russian" =
         { "{\cyr\cyri\cyrz}" }
         { "language is not defined: " language "of" *  * warning$ "of" }
@@ -493,7 +496,7 @@ FUNCTION {bbl.pages} % { "\bblpp." }
 FUNCTION {bbl.page} % { "\bblp." }
 {
   curlanguage "english" =
-    {"p."}
+    { "p." }
     { curlanguage "russian" =
         { "{\cyr\cyrs.}"}
         { "language is not defined: " language  "p." * * warning$ "p." }
@@ -543,7 +546,8 @@ FUNCTION {bbl.mthesis}
   curlanguage "english" =
     { "Master's thesis" }
     { 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}" }
+        { "{\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." }
       if$
     }
@@ -555,7 +559,8 @@ FUNCTION {bbl.phdthesis}
   curlanguage "english" =
     { "Ph.D. thesis" }
     { 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}" }
+        { "{\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." }
       if$
     }
@@ -574,8 +579,7 @@ FUNCTION {format.names}
     { s nameptr
       "{vv~}{ll}{~f.}{, jj}" format.name$ 't :=
       nameptr #1 >
-        {
-          nameptr #4 =
+        { nameptr #4 =
           numnames #4 > and
             { "others" 't :=
               #1 'namesleft := }
@@ -583,8 +587,7 @@ FUNCTION {format.names}
           if$
           namesleft #1 >
             { ", " * t * }
-            {
-              t "others" =
+            { t "others" =
               t "~others" =
               or
                 { " " * bbl.etal * }
@@ -611,8 +614,7 @@ FUNCTION {format.names.rev}
     { s nameptr
       "{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
       nameptr #1 >
-        {
-          nameptr #4 =
+        { nameptr #4 =
           numnames #4 > and
             { "others" 't :=
               #1 'namesleft := }
@@ -620,10 +622,9 @@ FUNCTION {format.names.rev}
           if$
           namesleft #1 >
             { ", " * t * }
-            {
-              t "others" =
-      t "~others" =
-      or
+            { t "others" =
+              t "~others" =
+              or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -699,9 +700,7 @@ FUNCTION {format.date}
   year empty$
     { month empty$
         { "" }
-        { "there's a month but no year in " cite$ * warning$
-          month
-        }
+        { "there's a month but no year in " cite$ * warning$ month }
       if$
     }
     { month empty$
@@ -927,8 +926,7 @@ FUNCTION {format.vol.num.pages}
   volume field.or.null
   number empty$
     'skip$
-    {
-      ", no." number tie.or.space.connect *
+    { ", no." number tie.or.space.connect *
       volume empty$
         { "there's a number but no volume in " cite$ * warning$ }
         'skip$
@@ -998,8 +996,7 @@ FUNCTION {author.before}
 {
   author empty$
     'skip$
-    {
-      format.authors output
+    { format.authors output
       new.sentence
     }
   if$
@@ -1009,8 +1006,7 @@ FUNCTION {bookauthor.before}
 {
   bookauthor empty$
     'skip$
-    {
-      format.bookauthors output
+    { format.bookauthors output
       new.sentence
     }
   if$
@@ -1104,13 +1100,32 @@ FUNCTION {format.annote}
   if$
 }
 
+FUNCTION {format.isbn}
+{
+  isbn empty$
+    { "" }
+    { "ISBN~" isbn * }
+  if$
+}
+
+FUNCTION {add.doi}
+{ duplicate$ empty$
+    'skip$
+    { doi empty$
+        'skip$
+        { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+      if$
+    }
+  if$
+}
+
 FUNCTION {article}
 {
   output.bibitem
   author.before
   format.title "title" output.check
   new.dblslash
-  journal emphasize "journal" output.check
+  journal emphasize add.doi "journal" output.check
   new.block
   format.date output
   new.block
@@ -1130,7 +1145,7 @@ FUNCTION {book}
 {
   output.bibitem
   author.before
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   editor.organization.after
   new.sentence
   format.number.series output
@@ -1143,6 +1158,8 @@ FUNCTION {book}
   new.block
   format.pages.page output
   new.block
+  format.isbn output
+  new.block
   note output
   new.sentence
   output.url
@@ -1172,7 +1189,7 @@ FUNCTION {inbook}
 {
   output.bibitem
   author.before
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.dblslash
   bookauthor.before
   booktitle "booktitle" output.check
@@ -1188,6 +1205,8 @@ FUNCTION {inbook}
   new.block
   format.pages.page output
   new.block
+  format.isbn output
+  new.block
   note output
   new.sentence
   output.url
@@ -1200,7 +1219,7 @@ FUNCTION {incollection}
   output.bibitem
   author.before
   new.sentence
-  format.title "title" output.check
+  format.title add.doi "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1225,7 +1244,7 @@ FUNCTION {inproceedings}
   output.bibitem
   author.before
   new.sentence
-  format.title "title" output.check
+  format.title add.doi "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1279,8 +1298,7 @@ FUNCTION {manual}
         'skip$
       if$
     }
-    {
-      organization address new.block.checkb
+    { organization address new.block.checkb
       organization output
       address output
     }
@@ -1300,7 +1318,7 @@ FUNCTION {mastersthesis}
   output.bibitem
   format.authors "author" output.check
   new.block
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.block
   bbl.mthesis format.thesis.type output.nonnull
   school "school" output.check
@@ -1337,7 +1355,7 @@ FUNCTION {phdthesis}
   output.bibitem
   format.authors "author" output.check
   new.sentence
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.column
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
@@ -1356,7 +1374,7 @@ FUNCTION {phdthesis}
 FUNCTION {proceedings}
 {
   output.bibitem
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.slash
   editor.organization.after
   new.block
@@ -1385,7 +1403,7 @@ FUNCTION {techreport}
   output.bibitem
   author.before
   new.sentence
-  format.title "title" output.check
+  format.title add.doi "title" output.check
   new.column
   format.tr.number output.nonnull
   editor.organization.after
@@ -1419,69 +1437,141 @@ FUNCTION {unpublished}
 FUNCTION {default.type} { misc }
 
 MACRO {jan} {"\bbljan{}"}
-
 MACRO {feb} {"\bblfeb{}"}
-
 MACRO {mar} {"\bblmar{}"}
-
 MACRO {apr} {"\bblapr{}"}
-
 MACRO {may} {"\bblmay{}"}
-
 MACRO {jun} {"\bbljun{}"}
-
 MACRO {jul} {"\bbljul{}"}
-
 MACRO {aug} {"\bblaug{}"}
-
 MACRO {sep} {"\bblsep{}"}
-
 MACRO {oct} {"\bbloct{}"}
-
 MACRO {nov} {"\bblnov{}"}
-
 MACRO {dec} {"\bbldec{}"}
 
-MACRO {acmcs} {"ACM Computing Surveys"}
-
-MACRO {acta} {"Acta Informatica"}
-
-MACRO {cacm} {"Communications of the ACM"}
-
-MACRO {ibmjrd} {"IBM Journal of Research and Development"}
-
-MACRO {ibmsj} {"IBM Systems Journal"}
-
-MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
-
-MACRO {ieeetc} {"IEEE Transactions on Computers"}
-
-MACRO {ieeetcad}
- {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
-
-MACRO {ipl} {"Information Processing Letters"}
-
-MACRO {jacm} {"Journal of the ACM"}
-
-MACRO {jcss} {"Journal of Computer and System Sciences"}
-
-MACRO {scp} {"Science of Computer Programming"}
-
-MACRO {sicomp} {"SIAM Journal on Computing"}
-
-MACRO {tocs} {"ACM Transactions on Computer Systems"}
-
-MACRO {tods} {"ACM Transactions on Database Systems"}
-
-MACRO {tog} {"ACM Transactions on Graphics"}
-
-MACRO {toms} {"ACM Transactions on Mathematical Software"}
-
-MACRO {toois} {"ACM Transactions on Office Information Systems"}
-
-MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
-
-MACRO {tcs} {"Theoretical Computer Science"}
+MACRO {aa}{"Astron. \& Astrophys."}
+MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
+MACRO {aj} {"Astron. J."}
+MACRO {aph} {"Acta Phys."}
+MACRO {advp} {"Adv. Phys."}
+MACRO {ajp} {"Amer. J. Phys."}
+MACRO {ajm} {"Amer. J. Math."}
+MACRO {amsci} {"Amer. Sci."}
+MACRO {anofd} {"Ann. Fluid Dyn."}
+MACRO {am} {"Ann. Math."}
+MACRO {ap} {"Ann. Phys. (NY)"}
+MACRO {adp} {"Ann. Phys. (Leipzig)"}
+MACRO {ao} {"Appl. Opt."}
+MACRO {apl} {"Appl. Phys. Lett."}
+MACRO {app} {"Astroparticle Phys."}
+MACRO {apj} {"Astrophys. J."}
+MACRO {apjsup} {"Astrophys. J. Suppl."}
+MACRO {apss} {"Astrophys. Space Sci."}
+MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
+MACRO {baas} {"Bull. Amer. Astron. Soc."}
+MACRO {baps} {"Bull. Amer. Phys. Soc."}
+MACRO {cmp} {"Comm. Math. Phys."}
+MACRO {cpam} {"Commun. Pure Appl. Math."}
+MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
+MACRO {cpc} {"Comp. Phys. Comm."}
+MACRO {cqg} {"Class. Quant. Grav."}
+MACRO {cra} {"C. R. Acad. Sci. A"}
+MACRO {fed} {"Fusion Eng. \& Design"}
+MACRO {ft} {"Fusion Tech."}
+MACRO {grg} {"Gen. Relativ. Gravit."}
+MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
+MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
+MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
+MACRO {ip} {"Infrared Phys."}
+MACRO {irp} {"Infrared Phys."}
+MACRO {jap} {"J. Appl. Phys."}
+MACRO {jasa} {"J. Acoust. Soc. America"}
+MACRO {jcp} {"J. Comp. Phys."}
+MACRO {jetp} {"Sov. Phys.--JETP"}
+MACRO {jfe} {"J. Fusion Energy"}
+MACRO {jfm} {"J. Fluid Mech."}
+MACRO {jmp} {"J. Math. Phys."}
+MACRO {jne} {"J. Nucl. Energy"}
+MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
+MACRO {jnm} {"J. Nucl. Mat."}
+MACRO {jpc} {"J. Phys. Chem."}
+MACRO {jpp} {"J. Plasma Phys."}
+MACRO {jpsj} {"J. Phys. Soc. Japan"}
+MACRO {jsi} {"J. Sci. Instrum."}
+MACRO {jvst} {"J. Vac. Sci. \& Tech."}
+MACRO {nat} {"Nature"}
+MACRO {nature} {"Nature"}
+MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
+MACRO {nf} {"Nucl. Fusion"}
+MACRO {nim} {"Nucl. Inst. \& Meth."}
+MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
+MACRO {np} {"Nucl. Phys."}
+MACRO {npb} {"Nucl. Phys. B"}
+MACRO {nt/f} {"Nucl. Tech./Fusion"}
+MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
+MACRO {inc} {"Nuovo Cimento"}
+MACRO {nc} {"Nuovo Cimento"}
+MACRO {pf} {"Phys. Fluids"}
+MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
+MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
+MACRO {pl} {"Phys. Lett."}
+MACRO {pla} {"Phys. Lett. A"}
+MACRO {plb} {"Phys. Lett. B"}
+MACRO {prep} {"Phys. Rep."}
+MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
+MACRO {pp} {"Phys. Plasmas"}
+MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
+MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
+MACRO {prl} {"Phys. Rev. Lett."}
+MACRO {pr} {"Phys. Rev."}
+MACRO {physrev} {"Phys. Rev."}
+MACRO {pra} {"Phys. Rev. A"}
+MACRO {prb} {"Phys. Rev. B"}
+MACRO {prc} {"Phys. Rev. C"}
+MACRO {prd} {"Phys. Rev. D"}
+MACRO {pre} {"Phys. Rev. E"}
+MACRO {ps} {"Phys. Scripta"}
+MACRO {procrsl} {"Proc. Roy. Soc. London"}
+MACRO {rmp} {"Rev. Mod. Phys."}
+MACRO {rsi} {"Rev. Sci. Inst."}
+MACRO {science} {"Science"}
+MACRO {sciam} {"Sci. Am."}
+MACRO {sam} {"Stud. Appl. Math."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspeki"}
+MACRO {st} {"Sky and Telesc."}
+
+MACRO {appopt} {"Appl. Opt."}
+MACRO {bell} {"Bell Syst. Tech. J."}
+MACRO {ell} {"Electron. Lett."}
+MACRO {jasp} {"J. Appl. Spectr."}
+MACRO {jqe} {"IEEE J. Quantum Electron."}
+MACRO {jlwt} {"J. Lightwave Technol."}
+MACRO {jmo} {"J. Mod. Opt."}
+MACRO {josa} {"J. Opt. Soc. America"}
+MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
+MACRO {josab} {"J. Opt. Soc. Amer.~B"}
+MACRO {jdp} {"J. Phys. (Paris)"}
+MACRO {oc} {"Opt. Commun."}
+MACRO {ol} {"Opt. Lett."}
+MACRO {os} {"Opt. Spectrosc."}
+MACRO {phtl} {"IEEE Photon. Technol. Lett."}
+MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
+MACRO {sjot} {"Sov. J. Opt. Technol."}
+MACRO {sjqe} {"Sov. J. Quantum Electron."}
+MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
+MACRO {stph} {"Sov. Phys.--Techn. Phys."}
+MACRO {stphl} {"Sov. Techn. Phys. Lett."}
+MACRO {vr} {"Vision Res."}
+MACRO {zph} {"Z. f. Physik"}
+MACRO {zphb} {"Z. f. Physik~B"}
+MACRO {zphd} {"Z. f. Physik~D"}
+
+MACRO {sse} {"Solid-State Electron."}
+MACRO {pss} {"Phys. Sol. State"}
+MACRO {sst} {"Semicond. Sci. Tech."}
 
 READ
 
diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
index 335783ba0a4..7e087d4bdd2 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
@@ -66,6 +66,8 @@ ENTRY
     booklanguage
     url
     urldate
+    isbn
+    doi
   }
   {}
   { label }
@@ -304,7 +306,8 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
   { "Ed. by " }
     { curlanguage "russian" =
         { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
-        { "language is not defined: " language  "edited by" * * warning$ "edited by" }
+        { "language is not defined: " language  "edited by" * *
+          warning$ "edited by" }
       if$
     }
   if$
@@ -373,7 +376,7 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
 FUNCTION {bbl.iiss} % { "\bblIss{}" }
 {
   curlanguage "english" =
-    {"Iss."}
+    { "Iss." }
     { curlanguage "russian" =
         { "{\cyr\CYRV\cyrery\cyrp.}" }
         { "language is not defined: " language * warning$ "Issue" }
@@ -385,7 +388,7 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
 FUNCTION {bbl.of} % { "\bblof{}" }
 {
   curlanguage "english" =
-    {"of"}
+    { "of" }
     { curlanguage "russian" =
         { "{\cyr\cyri\cyrz}" }
         { "language is not defined: " language "of" *  * warning$ "of" }
@@ -493,7 +496,7 @@ FUNCTION {bbl.pages} % { "\bblpp." }
 FUNCTION {bbl.page} % { "\bblp." }
 {
   curlanguage "english" =
-    {"p."}
+    { "p." }
     { curlanguage "russian" =
         { "{\cyr\cyrs.}"}
         { "language is not defined: " language  "p." * * warning$ "p." }
@@ -543,7 +546,8 @@ FUNCTION {bbl.mthesis}
   curlanguage "english" =
     { "Master's thesis" }
     { 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}" }
+        { "{\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." }
       if$
     }
@@ -555,7 +559,8 @@ FUNCTION {bbl.phdthesis}
   curlanguage "english" =
     { "Ph.D. thesis" }
     { 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}" }
+        { "{\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." }
       if$
     }
@@ -574,8 +579,7 @@ FUNCTION {format.names}
     { s nameptr
       "{vv~}{ll}{~f.}{, jj}" format.name$ 't :=
       nameptr #1 >
-        {
-          nameptr #4 =
+        { nameptr #4 =
           numnames #4 > and
             { "others" 't :=
               #1 'namesleft := }
@@ -583,8 +587,7 @@ FUNCTION {format.names}
           if$
           namesleft #1 >
             { ", " * t * }
-            {
-              t "others" =
+            { t "others" =
               t "~others" =
               or
                 { " " * bbl.etal * }
@@ -611,8 +614,7 @@ FUNCTION {format.names.rev}
     { s nameptr
       "{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
       nameptr #1 >
-        {
-          nameptr #4 =
+        { nameptr #4 =
           numnames #4 > and
             { "others" 't :=
               #1 'namesleft := }
@@ -620,10 +622,9 @@ FUNCTION {format.names.rev}
           if$
           namesleft #1 >
             { ", " * t * }
-            {
-              t "others" =
-      t "~others" =
-      or
+            { t "others" =
+              t "~others" =
+              or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -699,9 +700,7 @@ FUNCTION {format.date}
   year empty$
     { month empty$
         { "" }
-        { "there's a month but no year in " cite$ * warning$
-          month
-        }
+        { "there's a month but no year in " cite$ * warning$ month }
       if$
     }
     { month empty$
@@ -927,8 +926,7 @@ FUNCTION {format.vol.num.pages}
   volume field.or.null
   number empty$
     'skip$
-    {
-      ", no." number tie.or.space.connect *
+    { ", no." number tie.or.space.connect *
       volume empty$
         { "there's a number but no volume in " cite$ * warning$ }
         'skip$
@@ -998,8 +996,7 @@ FUNCTION {author.before}
 {
   author empty$
     'skip$
-    {
-      format.authors output
+    { format.authors output
       new.sentence
     }
   if$
@@ -1009,8 +1006,7 @@ FUNCTION {bookauthor.before}
 {
   bookauthor empty$
     'skip$
-    {
-      format.bookauthors output
+    { format.bookauthors output
       new.sentence
     }
   if$
@@ -1104,13 +1100,32 @@ FUNCTION {format.annote}
   if$
 }
 
+FUNCTION {format.isbn}
+{
+  isbn empty$
+    { "" }
+    { "ISBN~" isbn * }
+  if$
+}
+
+FUNCTION {add.doi}
+{ duplicate$ empty$
+    'skip$
+    { doi empty$
+        'skip$
+        { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+      if$
+    }
+  if$
+}
+
 FUNCTION {article}
 {
   output.bibitem
   author.before
   format.title "title" output.check
   new.dblslash
-  journal emphasize "journal" output.check
+  journal emphasize add.doi "journal" output.check
   new.block
   format.date output
   new.block
@@ -1130,7 +1145,7 @@ FUNCTION {book}
 {
   output.bibitem
   author.before
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   editor.organization.after
   new.sentence
   format.number.series output
@@ -1143,6 +1158,8 @@ FUNCTION {book}
   new.block
   format.pages.page output
   new.block
+  format.isbn output
+  new.block
   note output
   new.sentence
   output.url
@@ -1172,7 +1189,7 @@ FUNCTION {inbook}
 {
   output.bibitem
   author.before
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.dblslash
   bookauthor.before
   booktitle "booktitle" output.check
@@ -1188,6 +1205,8 @@ FUNCTION {inbook}
   new.block
   format.pages.page output
   new.block
+  format.isbn output
+  new.block
   note output
   new.sentence
   output.url
@@ -1200,7 +1219,7 @@ FUNCTION {incollection}
   output.bibitem
   author.before
   new.sentence
-  format.title "title" output.check
+  format.title add.doi "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1225,7 +1244,7 @@ FUNCTION {inproceedings}
   output.bibitem
   author.before
   new.sentence
-  format.title "title" output.check
+  format.title add.doi "title" output.check
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
@@ -1279,8 +1298,7 @@ FUNCTION {manual}
         'skip$
       if$
     }
-    {
-      organization address new.block.checkb
+    { organization address new.block.checkb
       organization output
       address output
     }
@@ -1300,7 +1318,7 @@ FUNCTION {mastersthesis}
   output.bibitem
   format.authors "author" output.check
   new.block
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.block
   bbl.mthesis format.thesis.type output.nonnull
   school "school" output.check
@@ -1337,7 +1355,7 @@ FUNCTION {phdthesis}
   output.bibitem
   format.authors "author" output.check
   new.sentence
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.column
   bbl.phdthesis format.thesis.type output.nonnull
   new.slash
@@ -1356,7 +1374,7 @@ FUNCTION {phdthesis}
 FUNCTION {proceedings}
 {
   output.bibitem
-  format.btitle "title" output.check
+  format.btitle add.doi "title" output.check
   new.slash
   editor.organization.after
   new.block
@@ -1385,7 +1403,7 @@ FUNCTION {techreport}
   output.bibitem
   author.before
   new.sentence
-  format.title "title" output.check
+  format.title add.doi "title" output.check
   new.column
   format.tr.number output.nonnull
   editor.organization.after
@@ -1419,69 +1437,141 @@ FUNCTION {unpublished}
 FUNCTION {default.type} { misc }
 
 MACRO {jan} {"\bbljan{}"}
-
 MACRO {feb} {"\bblfeb{}"}
-
 MACRO {mar} {"\bblmar{}"}
-
 MACRO {apr} {"\bblapr{}"}
-
 MACRO {may} {"\bblmay{}"}
-
 MACRO {jun} {"\bbljun{}"}
-
 MACRO {jul} {"\bbljul{}"}
-
 MACRO {aug} {"\bblaug{}"}
-
 MACRO {sep} {"\bblsep{}"}
-
 MACRO {oct} {"\bbloct{}"}
-
 MACRO {nov} {"\bblnov{}"}
-
 MACRO {dec} {"\bbldec{}"}
 
-MACRO {acmcs} {"ACM Computing Surveys"}
-
-MACRO {acta} {"Acta Informatica"}
-
-MACRO {cacm} {"Communications of the ACM"}
-
-MACRO {ibmjrd} {"IBM Journal of Research and Development"}
-
-MACRO {ibmsj} {"IBM Systems Journal"}
-
-MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
-
-MACRO {ieeetc} {"IEEE Transactions on Computers"}
-
-MACRO {ieeetcad}
- {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
-
-MACRO {ipl} {"Information Processing Letters"}
-
-MACRO {jacm} {"Journal of the ACM"}
-
-MACRO {jcss} {"Journal of Computer and System Sciences"}
-
-MACRO {scp} {"Science of Computer Programming"}
-
-MACRO {sicomp} {"SIAM Journal on Computing"}
-
-MACRO {tocs} {"ACM Transactions on Computer Systems"}
-
-MACRO {tods} {"ACM Transactions on Database Systems"}
-
-MACRO {tog} {"ACM Transactions on Graphics"}
-
-MACRO {toms} {"ACM Transactions on Mathematical Software"}
-
-MACRO {toois} {"ACM Transactions on Office Information Systems"}
-
-MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
-
-MACRO {tcs} {"Theoretical Computer Science"}
+MACRO {aa}{"Astron. \& Astrophys."}
+MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
+MACRO {aj} {"Astron. J."}
+MACRO {aph} {"Acta Phys."}
+MACRO {advp} {"Adv. Phys."}
+MACRO {ajp} {"Amer. J. Phys."}
+MACRO {ajm} {"Amer. J. Math."}
+MACRO {amsci} {"Amer. Sci."}
+MACRO {anofd} {"Ann. Fluid Dyn."}
+MACRO {am} {"Ann. Math."}
+MACRO {ap} {"Ann. Phys. (NY)"}
+MACRO {adp} {"Ann. Phys. (Leipzig)"}
+MACRO {ao} {"Appl. Opt."}
+MACRO {apl} {"Appl. Phys. Lett."}
+MACRO {app} {"Astroparticle Phys."}
+MACRO {apj} {"Astrophys. J."}
+MACRO {apjsup} {"Astrophys. J. Suppl."}
+MACRO {apss} {"Astrophys. Space Sci."}
+MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
+MACRO {baas} {"Bull. Amer. Astron. Soc."}
+MACRO {baps} {"Bull. Amer. Phys. Soc."}
+MACRO {cmp} {"Comm. Math. Phys."}
+MACRO {cpam} {"Commun. Pure Appl. Math."}
+MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
+MACRO {cpc} {"Comp. Phys. Comm."}
+MACRO {cqg} {"Class. Quant. Grav."}
+MACRO {cra} {"C. R. Acad. Sci. A"}
+MACRO {fed} {"Fusion Eng. \& Design"}
+MACRO {ft} {"Fusion Tech."}
+MACRO {grg} {"Gen. Relativ. Gravit."}
+MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
+MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
+MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
+MACRO {ip} {"Infrared Phys."}
+MACRO {irp} {"Infrared Phys."}
+MACRO {jap} {"J. Appl. Phys."}
+MACRO {jasa} {"J. Acoust. Soc. America"}
+MACRO {jcp} {"J. Comp. Phys."}
+MACRO {jetp} {"Sov. Phys.--JETP"}
+MACRO {jfe} {"J. Fusion Energy"}
+MACRO {jfm} {"J. Fluid Mech."}
+MACRO {jmp} {"J. Math. Phys."}
+MACRO {jne} {"J. Nucl. Energy"}
+MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
+MACRO {jnm} {"J. Nucl. Mat."}
+MACRO {jpc} {"J. Phys. Chem."}
+MACRO {jpp} {"J. Plasma Phys."}
+MACRO {jpsj} {"J. Phys. Soc. Japan"}
+MACRO {jsi} {"J. Sci. Instrum."}
+MACRO {jvst} {"J. Vac. Sci. \& Tech."}
+MACRO {nat} {"Nature"}
+MACRO {nature} {"Nature"}
+MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
+MACRO {nf} {"Nucl. Fusion"}
+MACRO {nim} {"Nucl. Inst. \& Meth."}
+MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
+MACRO {np} {"Nucl. Phys."}
+MACRO {npb} {"Nucl. Phys. B"}
+MACRO {nt/f} {"Nucl. Tech./Fusion"}
+MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
+MACRO {inc} {"Nuovo Cimento"}
+MACRO {nc} {"Nuovo Cimento"}
+MACRO {pf} {"Phys. Fluids"}
+MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
+MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
+MACRO {pl} {"Phys. Lett."}
+MACRO {pla} {"Phys. Lett. A"}
+MACRO {plb} {"Phys. Lett. B"}
+MACRO {prep} {"Phys. Rep."}
+MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
+MACRO {pp} {"Phys. Plasmas"}
+MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
+MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
+MACRO {prl} {"Phys. Rev. Lett."}
+MACRO {pr} {"Phys. Rev."}
+MACRO {physrev} {"Phys. Rev."}
+MACRO {pra} {"Phys. Rev. A"}
+MACRO {prb} {"Phys. Rev. B"}
+MACRO {prc} {"Phys. Rev. C"}
+MACRO {prd} {"Phys. Rev. D"}
+MACRO {pre} {"Phys. Rev. E"}
+MACRO {ps} {"Phys. Scripta"}
+MACRO {procrsl} {"Proc. Roy. Soc. London"}
+MACRO {rmp} {"Rev. Mod. Phys."}
+MACRO {rsi} {"Rev. Sci. Inst."}
+MACRO {science} {"Science"}
+MACRO {sciam} {"Sci. Am."}
+MACRO {sam} {"Stud. Appl. Math."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspeki"}
+MACRO {st} {"Sky and Telesc."}
+
+MACRO {appopt} {"Appl. Opt."}
+MACRO {bell} {"Bell Syst. Tech. J."}
+MACRO {ell} {"Electron. Lett."}
+MACRO {jasp} {"J. Appl. Spectr."}
+MACRO {jqe} {"IEEE J. Quantum Electron."}
+MACRO {jlwt} {"J. Lightwave Technol."}
+MACRO {jmo} {"J. Mod. Opt."}
+MACRO {josa} {"J. Opt. Soc. America"}
+MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
+MACRO {josab} {"J. Opt. Soc. Amer.~B"}
+MACRO {jdp} {"J. Phys. (Paris)"}
+MACRO {oc} {"Opt. Commun."}
+MACRO {ol} {"Opt. Lett."}
+MACRO {os} {"Opt. Spectrosc."}
+MACRO {phtl} {"IEEE Photon. Technol. Lett."}
+MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
+MACRO {sjot} {"Sov. J. Opt. Technol."}
+MACRO {sjqe} {"Sov. J. Quantum Electron."}
+MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
+MACRO {stph} {"Sov. Phys.--Techn. Phys."}
+MACRO {stphl} {"Sov. Techn. Phys. Lett."}
+MACRO {vr} {"Vision Res."}
+MACRO {zph} {"Z. f. Physik"}
+MACRO {zphb} {"Z. f. Physik~B"}
+MACRO {zphd} {"Z. f. Physik~D"}
+
+MACRO {sse} {"Solid-State Electron."}
+MACRO {pss} {"Phys. Sol. State"}
+MACRO {sst} {"Semicond. Sci. Tech."}
 
 READ
 
@@ -1544,15 +1634,11 @@ FUNCTION {author.sort}
 {
   author empty$
     { key empty$
-        { "to sort, need author or key in " cite$ * warning$
-          ""
-        }
+        { "to sort, need author or key in " cite$ * warning$ "" }
         { key sortify }
       if$
     }
-    {
-      author sort.format.names
-    }
+    { author sort.format.names }
   if$
 }
 
@@ -1561,18 +1647,14 @@ FUNCTION {author.title.sort}
   author empty$
     { title empty$
       { key empty$
-        { "to sort, need author, title, or key in " cite$ * warning$
-          ""
-        }
+        { "to sort, need author, title, or key in " cite$ * warning$ "" }
         { key sortify }
       if$
       }
       { title sort.format.title }
     if$
     }
-    {
-      author sort.format.names
-    }
+    { author sort.format.names }
   if$
 }