update achemso to v2.1

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

2 files changed, 98 insertions, 44 deletions

diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
index 5ab72d0fa8f..bf2dd563a22 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
@@ -213,6 +213,9 @@ FUNCTION {bbl.submitted}
 FUNCTION {bbl.techreport}
 { "Technical Report" }
 
+FUNCTION {bbl.version}
+{ "version" }
+
 FUNCTION {bbl.volume}
 { "Vol." }
 
@@ -681,6 +684,13 @@ FUNCTION {format.organization.address}
   if$
 }
 
+FUNCTION {format.version}
+{ edition empty$
+    { "" }
+    { bbl.version edition tie.or.space.connect }
+  if$
+}
+
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
   year empty$ note empty$
@@ -730,6 +740,7 @@ FUNCTION {book}
         { title format.title "title" output.check }
         { booktitle format.title "booktitle" output.check }
       if$
+      format.edition output
       new.block
       editor empty$
         { "Need either an author or editor for " cite$ * warning$ }
@@ -743,9 +754,9 @@ FUNCTION {book}
         { title format.title "title" output.check }
         { booktitle format.title "booktitle" output.check }
       if$
+      format.edition output
     }
   if$
-  format.edition output
   new.block
   format.number.series output
   new.block
@@ -777,6 +788,7 @@ FUNCTION {inbook}
 { output.bibitem
   author empty$
     { title format.title "title" output.check
+      format.edition output
       new.block
       editor empty$
       { "Need at least an author or an editor for " cite$ * warning$ }
@@ -786,9 +798,9 @@ FUNCTION {inbook}
     { format.authors output
       after.item 'output.state :=
       title format.title.in "title" output.check
+      format.edition output
     }
   if$
-  format.edition output
   new.block
   format.number.series output
   new.block
@@ -805,6 +817,7 @@ FUNCTION {incollection}
 { output.bibitem
   author empty$
     { booktitle format.title "booktitle" output.check
+      format.edition output
       new.block
       editor empty$
         { "Need at least an author or an editor for " cite$ * warning$ }
@@ -814,9 +827,9 @@ FUNCTION {incollection}
     { format.authors output
       after.item 'output.state :=
       booktitle format.title.in "booktitle" output.check
+      format.edition output
     }
   if$
-  format.edition output
   new.block
   format.number.series output
   new.block
@@ -848,7 +861,13 @@ FUNCTION {inproceedings}
 { output.bibitem
   format.authors "author" output.check
   after.item 'output.state :=
-  booktitle format.title.noemph "booktitle" output.check
+  title empty$
+    'skip$
+    { title format.title.noemph output
+      after.sentence 'output.state :=
+    }
+  if$
+  booktitle format.title output
   address output
   format.bdate "year" output.check
   pages empty$
@@ -865,9 +884,9 @@ FUNCTION {manual}
   format.authors output
   after.item 'output.state :=
   title format.title "title" output.check
+  format.version output
   new.block
   format.organization.address output
-  format.edition output
   format.bdate output
   note output
   fin.entry
@@ -888,7 +907,10 @@ FUNCTION {misc}
 { output.bibitem
   format.authors output
   after.item 'output.state :=
-  title format.title output
+  title empty$
+    'skip$
+    { title format.title output }
+  if$
   howpublished output
   year output
   note output
@@ -900,7 +922,8 @@ FUNCTION {patent}
 { output.bibitem
   format.authors "author" output.check
   after.item 'output.state :=
-  journal emphasize "journal" output.check
+  journal "journal" output.check
+  after.item 'output.state :=
   format.pages.patent "pages" output.check
   format.bdate "year" output.check
   note output
@@ -950,19 +973,23 @@ FUNCTION {techreport}
   format.authors "author" output.check
   after.item 'output.state :=
   title format.title "title" output.check
-  institution
+  new.block
   type empty$
     'bbl.techreport
     'type
   if$
-  space.connect
   number empty$
-    { "t" change.case$ }
+    'skip$
     { number tie.or.space.connect }
   if$
   output
   format.pub.address output
   format.bdate "year" output.check
+  pages empty$
+    'skip$
+    { new.block
+      format.pages output }
+  if$
   note output
   fin.entry
 }
@@ -1013,11 +1040,11 @@ MACRO {bicoc} {"Bioconj.\ Chem."}  % ***
 MACRO {bitech} {"Biotechnol.\ Progr."}  % ***
 MACRO {chemeng} {"Chem.\ Eng.\ News"}
 MACRO {chs} {"Chem.\ Health Safety"} % ***
-MACRO {crt} {"Chem.\ Res.\ Tox."} % ***
+MACRO {crt} {"Chem.\ Res.\ Toxicol."} % ***
 MACRO {chemrev} {"Chem.\ Rev."} % ***
-MACRO {cmat} {"Chem.\ Mat."} % ***
+MACRO {cmat} {"Chem.\ Mater."} % ***
 MACRO {chemtech} {"{CHEMTECH}"} % ***
-MACRO {enfu} {"Energy \&{} Fuels"} % ***
+MACRO {enfu} {"Energy Fuels"} % ***
 MACRO {envst} {"Environ.\ Sci.\ Technol."}
 MACRO {iecf} {"Ind.\ Eng.\ Chem.\ Fundam."}
 MACRO {iecpdd} {"Ind.\ Eng.\ Chem.\ Proc.\ Des.\ Dev."}
@@ -1047,18 +1074,18 @@ MACRO {tfs} {"Trans.\ Faraday Soc."}
 MACRO {jcis} {"J.~Colloid Interface Sci."}
 MACRO {acis} {"Adv.~Colloid Interface Sci."}
 MACRO {cs} {"Colloids Surf."}
-MACRO {csa} {"Colloids Surf.\ A:\ Physicochem.\ Eng.\ Apects"}
-MACRO {csb} {"Colloids Surf.\ B:\ Biointerfaces"}
+MACRO {csa} {"Colloids Surf.\ A"}
+MACRO {csb} {"Colloids Surf.\ B"}
 MACRO {pcps} {"Progr.\ Colloid Polym.\ Sci."}
 MACRO {jmr} {"J.~Magn.\ Reson."}
 MACRO {jmra} {"J.~Magn.\ Reson.\ A"}
 MACRO {jmrb} {"J.~Magn.\ Reson.\ B"}
-MACRO {sci} {"Science (Washington,~D.C.)"}
-MACRO {nat} {"Nature (London)"}
+MACRO {sci} {"Science"}
+MACRO {nat} {"Nature"}
 MACRO {jcch} {"J.~Comput.\ Chem."}
 MACRO {cca} {"Croat.\ Chem.\ Acta"}
-MACRO {angew} {"Angew.\ Chem.\ Int.\ Ed."}
-MACRO {chemeurj} {"Chem.--Eur.\ J."}
+MACRO {angew} {"Angew.\ Chem., Int.\ Ed."}
+MACRO {chemeurj} {"Chem.---Eur.\ J."}
 
 MACRO {poly} {"Polymer"}
 MACRO {ajp} {"Am.\ J.\ Phys."}
@@ -1068,11 +1095,11 @@ MACRO {cpl} {"Chem.\ Phys.\ Lett."}
 MACRO {molph} {"Mol.\ Phys."}
 MACRO {pac} {"Pure Appl.\ Chem."}
 MACRO {jbc} {"J.~Biol.\ Chem."}
-MACRO {tl} {"Tetrahedron Lett.\"}
+MACRO {tl} {"Tetrahedron Lett."}
 MACRO {psisoe} {"Proc.\ SPIE-Int.\ Soc.\ Opt.\ Eng."}
-MACRO {prb} {"Phys.\ Rev.\ B:\ Condens.\ Matter"}
+MACRO {prb} {"Phys.\ Rev.\ B:\ Condens.\ Matter Mater. Phys."}
 MACRO {jap} {"J.~Appl.\ Phys."}
-MACRO {pnac} {"Proc.\ Natl.\ Acad.\ Sci.\ U.~S.~A. "}
+MACRO {pnac} {"Proc.\ Natl.\ Acad.\ Sci.\ U.S.A."}
 MACRO {bba} {"Biochim.\ Biophys.\ Acta"}
 MACRO {nar} {"Nucleic.\ Acid Res."}
 
diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst b/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst
index 287c8fb78c7..52735a8cf83 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst
@@ -223,6 +223,9 @@ FUNCTION {bbl.submitted}
 FUNCTION {bbl.techreport}
 { "Technical Report" }
 
+FUNCTION {bbl.version}
+{ "version" }
+
 FUNCTION {bbl.volume}
 { "Vol." }
 
@@ -691,6 +694,13 @@ FUNCTION {format.organization.address}
   if$
 }
 
+FUNCTION {format.version}
+{ edition empty$
+    { "" }
+    { bbl.version edition tie.or.space.connect }
+  if$
+}
+
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
   year empty$ note empty$
@@ -740,6 +750,7 @@ FUNCTION {book}
         { title format.title "title" output.check }
         { booktitle format.title "booktitle" output.check }
       if$
+      format.edition output
       new.block
       editor empty$
         { "Need either an author or editor for " cite$ * warning$ }
@@ -753,9 +764,9 @@ FUNCTION {book}
         { title format.title "title" output.check }
         { booktitle format.title "booktitle" output.check }
       if$
+      format.edition output
     }
   if$
-  format.edition output
   new.block
   format.number.series output
   new.block
@@ -787,6 +798,7 @@ FUNCTION {inbook}
 { output.bibitem
   author empty$
     { title format.title "title" output.check
+      format.edition output
       new.block
       editor empty$
       { "Need at least an author or an editor for " cite$ * warning$ }
@@ -796,9 +808,9 @@ FUNCTION {inbook}
     { format.authors output
       after.item 'output.state :=
       title format.title.in "title" output.check
+      format.edition output
     }
   if$
-  format.edition output
   new.block
   format.number.series output
   new.block
@@ -815,6 +827,7 @@ FUNCTION {incollection}
 { output.bibitem
   author empty$
     { booktitle format.title "booktitle" output.check
+      format.edition output
       new.block
       editor empty$
         { "Need at least an author or an editor for " cite$ * warning$ }
@@ -824,9 +837,9 @@ FUNCTION {incollection}
     { format.authors output
       after.item 'output.state :=
       booktitle format.title.in "booktitle" output.check
+      format.edition output
     }
   if$
-  format.edition output
   new.block
   format.number.series output
   new.block
@@ -858,7 +871,13 @@ FUNCTION {inproceedings}
 { output.bibitem
   format.authors "author" output.check
   after.item 'output.state :=
-  booktitle format.title.noemph "booktitle" output.check
+  title empty$
+    'skip$
+    { title format.title.noemph output
+      after.sentence 'output.state :=
+    }
+  if$
+  booktitle format.title output
   address output
   format.bdate "year" output.check
   pages empty$
@@ -875,9 +894,9 @@ FUNCTION {manual}
   format.authors output
   after.item 'output.state :=
   title format.title "title" output.check
+  format.version output
   new.block
   format.organization.address output
-  format.edition output
   format.bdate output
   note output
   fin.entry
@@ -898,7 +917,10 @@ FUNCTION {misc}
 { output.bibitem
   format.authors output
   after.item 'output.state :=
-  title format.title output
+  title empty$
+    'skip$
+    { title format.title output }
+  if$
   howpublished output
   year output
   note output
@@ -910,7 +932,8 @@ FUNCTION {patent}
 { output.bibitem
   format.authors "author" output.check
   after.item 'output.state :=
-  journal emphasize "journal" output.check
+  journal "journal" output.check
+  after.item 'output.state :=
   format.pages.patent "pages" output.check
   format.bdate "year" output.check
   note output
@@ -960,19 +983,23 @@ FUNCTION {techreport}
   format.authors "author" output.check
   after.item 'output.state :=
   title format.title "title" output.check
-  institution
+  new.block
   type empty$
     'bbl.techreport
     'type
   if$
-  space.connect
   number empty$
-    { "t" change.case$ }
+    'skip$
     { number tie.or.space.connect }
   if$
   output
   format.pub.address output
   format.bdate "year" output.check
+  pages empty$
+    'skip$
+    { new.block
+      format.pages output }
+  if$
   note output
   fin.entry
 }
@@ -1023,11 +1050,11 @@ MACRO {bicoc} {"Bioconj.\ Chem."}  % ***
 MACRO {bitech} {"Biotechnol.\ Progr."}  % ***
 MACRO {chemeng} {"Chem.\ Eng.\ News"}
 MACRO {chs} {"Chem.\ Health Safety"} % ***
-MACRO {crt} {"Chem.\ Res.\ Tox."} % ***
+MACRO {crt} {"Chem.\ Res.\ Toxicol."} % ***
 MACRO {chemrev} {"Chem.\ Rev."} % ***
-MACRO {cmat} {"Chem.\ Mat."} % ***
+MACRO {cmat} {"Chem.\ Mater."} % ***
 MACRO {chemtech} {"{CHEMTECH}"} % ***
-MACRO {enfu} {"Energy \&{} Fuels"} % ***
+MACRO {enfu} {"Energy Fuels"} % ***
 MACRO {envst} {"Environ.\ Sci.\ Technol."}
 MACRO {iecf} {"Ind.\ Eng.\ Chem.\ Fundam."}
 MACRO {iecpdd} {"Ind.\ Eng.\ Chem.\ Proc.\ Des.\ Dev."}
@@ -1057,18 +1084,18 @@ MACRO {tfs} {"Trans.\ Faraday Soc."}
 MACRO {jcis} {"J.~Colloid Interface Sci."}
 MACRO {acis} {"Adv.~Colloid Interface Sci."}
 MACRO {cs} {"Colloids Surf."}
-MACRO {csa} {"Colloids Surf.\ A:\ Physicochem.\ Eng.\ Apects"}
-MACRO {csb} {"Colloids Surf.\ B:\ Biointerfaces"}
+MACRO {csa} {"Colloids Surf.\ A"}
+MACRO {csb} {"Colloids Surf.\ B"}
 MACRO {pcps} {"Progr.\ Colloid Polym.\ Sci."}
 MACRO {jmr} {"J.~Magn.\ Reson."}
 MACRO {jmra} {"J.~Magn.\ Reson.\ A"}
 MACRO {jmrb} {"J.~Magn.\ Reson.\ B"}
-MACRO {sci} {"Science (Washington,~D.C.)"}
-MACRO {nat} {"Nature (London)"}
+MACRO {sci} {"Science"}
+MACRO {nat} {"Nature"}
 MACRO {jcch} {"J.~Comput.\ Chem."}
 MACRO {cca} {"Croat.\ Chem.\ Acta"}
-MACRO {angew} {"Angew.\ Chem.\ Int.\ Ed."}
-MACRO {chemeurj} {"Chem.--Eur.\ J."}
+MACRO {angew} {"Angew.\ Chem., Int.\ Ed."}
+MACRO {chemeurj} {"Chem.---Eur.\ J."}
 
 MACRO {poly} {"Polymer"}
 MACRO {ajp} {"Am.\ J.\ Phys."}
@@ -1078,11 +1105,11 @@ MACRO {cpl} {"Chem.\ Phys.\ Lett."}
 MACRO {molph} {"Mol.\ Phys."}
 MACRO {pac} {"Pure Appl.\ Chem."}
 MACRO {jbc} {"J.~Biol.\ Chem."}
-MACRO {tl} {"Tetrahedron Lett.\"}
+MACRO {tl} {"Tetrahedron Lett."}
 MACRO {psisoe} {"Proc.\ SPIE-Int.\ Soc.\ Opt.\ Eng."}
-MACRO {prb} {"Phys.\ Rev.\ B:\ Condens.\ Matter"}
+MACRO {prb} {"Phys.\ Rev.\ B:\ Condens.\ Matter Mater. Phys."}
 MACRO {jap} {"J.~Appl.\ Phys."}
-MACRO {pnac} {"Proc.\ Natl.\ Acad.\ Sci.\ U.~S.~A. "}
+MACRO {pnac} {"Proc.\ Natl.\ Acad.\ Sci.\ U.S.A."}
 MACRO {bba} {"Biochim.\ Biophys.\ Acta"}
 MACRO {nar} {"Nucleic.\ Acid Res."}