asmeconf (15apr20)

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

1 files changed, 199 insertions, 76 deletions

diff --git a/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst b/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst
index 961645f7fef..1388b084f8b 100644
--- a/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst
+++ b/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst
@@ -1,10 +1,10 @@
 %%%%%  
 %%%%% ***   This .bst produces the reference format for ASME conference papers.       ***
-%%%%% ***   Follows the examples given on ASME's conference web pages in early 2019.  ***
+%%%%% ***   Follows the examples given on ASME's conference web pages in early 2020.  ***
 %%%%% ***   https://www.asme.org/shop/proceedings/conference-publications/references  ***
-%%%%% ***   The examples given by ASME do not cover all possibilities                 ***
+%%%%% ***   The examples given by ASME do *not* cover all possibilities               ***
 %%%%%
-%%%%%  This file is version 1.1 dated 2019/07/07
+%%%%%  This file is version 1.11 dated 2020/04/14
 %%%%%
 %%%%%       Author: John H. Lienhard V
 %%%%%               Department of Mechanical Engineering
@@ -26,13 +26,29 @@
 %%%%% Added: urlprefix = {}, format.web.urldate, bbl.urldate; urltype field changes "accessed" to something else. 
 %%%%% Added: venue and eventdate to @inproceedings
 %%%%%
+%%%%% Edits in version 1.11, 2020/04/14: 
+%%%%%		correct error in journal eid code.
+%%%%%		remove comma between Vol. and No. in article, per ASME style
+%%%%%		capitalize "Thesis", per ASME style
+%%%%%		insert "." after techreport number, per ASME style
+%%%%%		edits to @inbook, @proceedings, @incollection related to chapter and series.
+%%%%%		make punctuation after "(ed.)" consistent across entries.
+%%%%%		adjust block breaks in @online.
+%%%%%		allow for venue and eventdate in @proceedings
+%%%%%		add macros for ASME journal titles. add hdl as an equivalent to hndl archive macro.
+%%%%%       add numpages functionality for eid: "eid (numpages pages)"
+%%%%%		remove "doi" field from @online (since doi is a digital object identifier, not a web page).
+%%%%%		add "urldate" to eprint format, for optional use.
+%%%%%		warn in @online not to use both eprint and url, and warn if neither is given.
+%%%%%       remove series and add volume to @inproceedings.
+%%%%%
 %%%%%  Feel free to edit this file to suit your own needs, but please make note of changes in this header.
 %%%%%
 %%=========================================================
 %% LICENSE:
 %% This file is a derivative work from the generated file, as envisioned by the LaTeX Project Public License.
 %%
-%% Copyright (c) 2019 John Lienhard
+%% Copyright (c) 2020 John Lienhard
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 %% associated documentation files (the "Software"), to deal in the Software without restriction, 
@@ -319,6 +335,9 @@ FUNCTION {bbl.nr}
 FUNCTION {bbl.in}
 { "in" }
 
+FUNCTION {bbl.paperno}
+{ "" }
+
 FUNCTION {bbl.pages}
 { "pp." }
 
@@ -335,10 +354,10 @@ FUNCTION {bbl.techrep}
 { "Technical Report" }
 
 FUNCTION {bbl.mthesis}
-{ "Master's thesis" }
+{ "Master's Thesis" }
 
 FUNCTION {bbl.phdthesis}
-{ "Ph.D. thesis" }
+{ "Ph.D. Thesis" }
 
 FUNCTION {bbl.first}
 { "1st" }
@@ -368,7 +387,7 @@ FUNCTION {bbl.th}
 { "th" }
 
 FUNCTION {bbl.urldate}
- { "accessed" }
+ { "Accessed" }
  
 
 MACRO {jan} {"Jan."}
@@ -420,13 +439,75 @@ MACRO {arxiv} {"https://arxiv.org/abs/"}
 
 MACRO {googlebooks} {"http://books.google.com/books?id="}
 
+MACRO {hdl}  {"http://hdl.handle.net/"}
 MACRO {hndl} {"http://hdl.handle.net/"}
 
 MACRO {jstor} {"http://www.jstor.org/stable/"}
 
+MACRO {oclc} {"http://www.worldcat.org/oclc/"}
+
 MACRO {pubmed} {"http://www.ncbi.nlm.nih.gov/pubmed/"}
 
 
+MACRO {amr} {"Appl. Mech. Rev."}
+
+MACRO {lds} {"ASME Letters Dynamic Systems"}
+
+MACRO {jru} {"ASME J. Risk Uncertainty"}
+
+MACRO {jsbc} {"ASME J. Sustainable Bldg. and Cities"}
+
+MACRO {jam} {"ASME J. Appl. Mech."}
+
+MACRO {jbe} {"ASME J. Biomed. Eng."}
+
+MACRO {jcnd} {"ASME J. Comput. Nonlin. Dyn."}
+
+MACRO {jcise} {"ASME J. Comput. Inf. Sci. Eng."}
+
+MACRO {jds} {"J. Dyn. Syst.-T. ASME"}
+
+MACRO {jep} {"ASME J. Electron. Packag."}
+
+MACRO {jert} {"ASME J. Energy Resour."}
+
+MACRO {jegtp} {"ASME J. Eng. Gas Turbines Power"}
+
+MACRO {jem} {"ASME J. Eng. Mater."}
+
+MACRO {jfe} {"ASME J. Fluids Eng."}
+
+MACRO {jfcst} {"ASME J. Fuel Cell Sci. Tech."}
+
+MACRO {jht} {"ASME J. Heat Transfer"}
+
+MACRO {jmse} {"ASME J. Manuf. Sci. E."}
+
+MACRO {jmd} {"ASME J. Mech. Des."}
+
+MACRO {jmr} {"ASME J. Mech. Robot."}
+
+MACRO {jmdv} {"ASME J. Med. Devices"}
+
+MACRO {jmnm} {"ASME J. Micro Nano-Manuf."}
+
+MACRO {jnem} {"ASME J. Nanotech Eng. Med."}
+
+MACRO {joma} {"ASME J. Offshore Mech. Arct."}
+
+MACRO {jpv} {"ASME J. Press. Vess."}
+
+MACRO {jse} {"ASME J. Sol. Energy"}
+
+MACRO {jtsea} {"ASME J. Therm. Sci. Eng. Appl."}
+
+MACRO {jtb} {"ASME J. Tribol."}
+
+MACRO {jtm} {"ASME J. Turbomach."}
+
+MACRO {jva} {"ASME J. Vib. Acoust."}
+
+
 MACRO {acmcs} {"ACM Computing Surveys"}
 
 MACRO {acta} {"Acta Informatica"}
@@ -504,21 +585,6 @@ FUNCTION {bibinfo.warn}
   if$
 }
 
-
-FUNCTION {format.eprint}
-{ eprint duplicate$ empty$
-    'skip$
-    { "\eprint"
-      archive empty$
-         { "there's an eprint but no archive in " cite$ * warning$ }
-        { "[" * archive * "]" * }
-      if$
-      "{" * swap$ * "}" *
-    }
-  if$
-}
-
-
 FUNCTION {format.web.urldate}
 { urldate empty$
   {""}
@@ -537,6 +603,20 @@ FUNCTION {format.web.urldate}
   if$
 }
 
+FUNCTION {format.eprint}
+{ eprint duplicate$ empty$
+    'skip$
+    { "\eprint"
+      archive empty$
+         { "there's an eprint but no archive in " cite$ * warning$ }
+        { "[" * archive * "]" * }
+      if$
+      "{" * swap$ * "}" *
+      format.web.urldate swap$ *
+    }
+  if$
+}
+
 FUNCTION {format.url}
 {
   url
@@ -616,7 +696,6 @@ FUNCTION {get.bbl.editor}
 FUNCTION {format.editors}
 { editor "editor" format.names duplicate$ empty$ 'skip$
     {
-      "," *
       " " *
       get.bbl.editor
    "(" swap$ * ")" *
@@ -788,6 +867,20 @@ FUNCTION {format.bvolume}
     }
   if$
 }
+
+FUNCTION {format.paper.number}
+{ number "number" bibinfo.check
+  type duplicate$ empty$
+    { pop$ bbl.paperno }
+    'skip$
+  if$
+  "type" bibinfo.check
+  swap$ duplicate$ empty$
+    { pop$ "t" change.case$ }
+    { tie.or.space.prefix * * }
+  if$
+}
+
 FUNCTION {format.number.series}
 { volume empty$
     { number empty$
@@ -800,7 +893,7 @@ FUNCTION {format.number.series}
               if$
               number tie.or.space.prefix "number" bibinfo.check * *
               bbl.in space.word *
-              series "series" bibinfo.check *
+              series emphasize "series" bibinfo.check *
             }
           if$
         }
@@ -939,19 +1032,21 @@ FUNCTION {format.journal.eid}
 { eid "eid" bibinfo.check
   duplicate$ empty$ 'pop$
     { swap$ duplicate$ empty$ 'skip$
-      {
+       {
           " " *
-      }
-      if$
-      swap$ *
-      numpages empty$ 'skip$
-        { bbl.eidpp numpages tie.or.space.prefix
-          "numpages" bibinfo.check * *
-          " (" swap$ * ")" * *
+          format.year * ": " *
+          swap$
+          * 
+	      numpages empty$ 'skip$
+	        { numpages bbl.eidpp tie.or.space.prefix
+	          "numpages" bibinfo.check  * *
+	          " (" swap$ * ")" * *
+	        }
+	      if$
         }
       if$
-    }
-  if$
+      }
+   if$
 }
 FUNCTION {format.vol.num.pages}
 { volume field.or.null
@@ -969,14 +1064,14 @@ FUNCTION {format.vol.num.pages}
         'skip$
       if$
       swap$
-      ", " bbl.nr * number tie.or.space.prefix pop$ * swap$ *
+      " " bbl.nr * number tie.or.space.prefix pop$ * swap$ *
     }
   if$ *
 }
 
 FUNCTION {format.chapter.pages}
 { chapter empty$
-    { "" }
+    'format.pages
     { type empty$
         { bbl.chapter }
         { type "l" change.case$
@@ -985,6 +1080,10 @@ FUNCTION {format.chapter.pages}
       if$
       chapter tie.or.space.prefix
       "chapter" bibinfo.check
+      pages empty$
+        'skip$
+        { ", " * format.pages * }
+      if$
       * *
     }
   if$
@@ -1003,7 +1102,7 @@ FUNCTION {format.in.ed.booktitle}
           "" *
           " " *
           get.bbl.editor
-          "(" swap$ * ") " *
+          "(" swap$ * "). " *
           * swap$
           * }
       if$
@@ -1193,7 +1292,6 @@ FUNCTION {book}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check
-      add.blank
     }
     { format.authors output.nonnull
       crossref missing$
@@ -1227,6 +1325,7 @@ FUNCTION {book}
   format.note output
   fin.entry
 }
+
 FUNCTION {booklet}
 { output.bibitem
   format.authors output
@@ -1263,22 +1362,23 @@ FUNCTION {inbook}
   new.block
   crossref missing$
     {
+      format.bvolume output
       format.number.series output
+      new.block
+      new.sentence
       format.publisher.address output
-      format.bvolume output
-      format.chapter.pages "chapter and pages" output.check
       new.block
       new.sentence
     }
     {
-      format.chapter.pages "chapter and pages" output.check
       new.block
       format.book.crossref output.nonnull
     }
   if$
   format.date "year" output.check
   date.block
-  format.pages "pages" output.check
+  format.chapter.pages "chapter and pages" output.check
+  new.block
   format.doi output
   new.block
   format.eprint output
@@ -1297,9 +1397,9 @@ FUNCTION {incollection}
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
       format.edition output
+	  new.block
       format.number.series output
       format.bvolume output
-      format.chapter.pages output
       new.sentence
       format.publisher.address output
     }
@@ -1309,7 +1409,7 @@ FUNCTION {incollection}
   if$
   format.date "year" output.check
   conf.date.block
-  format.pages "pages" output.check
+  format.chapter.pages "pages" output.check
   format.doi output
   new.block
   format.eprint output
@@ -1327,8 +1427,13 @@ FUNCTION {inproceedings}
   new.block
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
+	  volume empty$ 'skip$
+	    { bbl.volume volume tie.or.space.prefix
+	      "volume" bibinfo.check * * output
+	    }
+	  if$
       new.sentence
-      format.number.series output
+      format.paper.number output
       conf.date.block
       format.pages "pages" output.check
       new.sentence
@@ -1355,6 +1460,7 @@ FUNCTION {inproceedings}
   fin.entry
 }
 FUNCTION {conference} { inproceedings }
+
 FUNCTION {manual}
 { output.bibitem
   author empty$
@@ -1435,6 +1541,46 @@ FUNCTION {misc}
   empty.misc.check
 }
 
+FUNCTION {online}
+{ output.bibitem
+  author empty$
+    { format.editors "author and editor" output.check
+    }
+    { format.authors output.nonnull
+      crossref missing$
+        { "author and editor" editor either.or.check }
+        'skip$
+      if$
+    }
+  if$
+  new.block
+  format.title
+  "title" output.check
+  new.block
+  organization "organization" bibinfo.warn output
+  address "address" bibinfo.check output  
+  format.date "year" output.check
+  new.block
+  url empty$
+     { eprint empty$
+         { "missing url and eprint in" cite$ * warning$ }
+         { format.eprint output }
+       if$
+     }
+     { "url and eprint" eprint either.or.check     
+       format.url "url" bibinfo.warn output
+     }
+   if$
+  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {electronic} { online }
+
+FUNCTION {www} { online }
+
+
 FUNCTION {phdthesis}
 { output.bibitem
   format.authors "author" output.check
@@ -1461,11 +1607,16 @@ FUNCTION {proceedings}
   editor empty$
     { organization "organization" bibinfo.check output
     }
-    { format.editors output.nonnull }
+    { format.editors output.nonnull 
+    }
   if$
   new.block
   format.btitle "title" output.check
   format.bvolume output
+  new.block
+  venue "venue" output.check
+  eventdate "eventdate" output.check
+  new.block
   editor empty$
     { publisher empty$
         {  format.number.series output }
@@ -1490,7 +1641,7 @@ FUNCTION {proceedings}
       if$
      }
   if$
-      format.date "year" output.check
+  format.date "year" output.check
   format.doi output
   new.block
   format.eprint output
@@ -1508,6 +1659,7 @@ FUNCTION {techreport}
   "title" output.check
   new.block
   format.tr.number output.nonnull
+  new.block
   institution "institution" bibinfo.warn output
   address "address" bibinfo.check output
   new.block
@@ -1521,35 +1673,6 @@ FUNCTION {techreport}
   fin.entry
 }
 
-FUNCTION {online}
-{ output.bibitem
-  author empty$
-    { format.editors "author and editor" output.check
-    }
-    { format.authors output.nonnull
-      crossref missing$
-        { "author and editor" editor either.or.check }
-        'skip$
-      if$
-    }
-  if$
-  format.title
-  "title" output.check
-  new.block
-  organization "organization" bibinfo.warn output
-  address "address" bibinfo.check output  
-  format.date "year" output.check
-  format.doi output
-  format.note output
-  format.eprint output
-  format.url "url" bibinfo.warn output
-  fin.entry
-}
-
-FUNCTION {electronic} { online }
-
-FUNCTION {www} { online }
-
 FUNCTION {unpublished}
 { output.bibitem
   format.authors "author" output.check