achemso update (4mar10)

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

2 files changed, 40 insertions, 20 deletions

diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
index 07647db6a23..857bbc639c8 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
@@ -289,9 +289,6 @@ FUNCTION {bbl.phd}
 FUNCTION {bbl.submitted}
 { "submitted for publication" }
 
-FUNCTION {bbl.techreport}
-{ "Technical Report" }
-
 FUNCTION {bbl.version}
 { "version" }
 
@@ -934,6 +931,17 @@ FUNCTION {format.title.in}
   if$
 }
 
+FUNCTION {format.org.address}
+{ organization empty$
+    { "" }
+    { address empty$
+        { organization }
+        { organization add.colon address *}
+      if$
+    }
+  if$
+}
+
 FUNCTION {format.pub.address}
 { publisher empty$
     { "" }
@@ -1253,15 +1261,17 @@ FUNCTION {techreport}
   title format.title "title" output.check
   new.block
   type empty$
-    'bbl.techreport
-    'type
-  if$
-  number empty$
     'skip$
-    { number tie.or.space.connect }
+    {
+      type
+      number empty$
+        'skip$
+        { number tie.or.space.connect }
+      if$
+      output
+    }
   if$
-  output
-  format.pub.address output
+  format.org.address output
   format.bdate "year" output.check
   pages empty$
     'skip$
diff --git a/Master/texmf-dist/bibtex/bst/achemso/biochem.bst b/Master/texmf-dist/bibtex/bst/achemso/biochem.bst
index b4d4d65bea0..de07e4cb6fa 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/biochem.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/biochem.bst
@@ -289,9 +289,6 @@ FUNCTION {bbl.phd}
 FUNCTION {bbl.submitted}
 { "submitted for publication" }
 
-FUNCTION {bbl.techreport}
-{ "Technical Report" }
-
 FUNCTION {bbl.version}
 { "version" }
 
@@ -939,6 +936,17 @@ FUNCTION {format.title.in}
   if$
 }
 
+FUNCTION {format.org.address}
+{ organization empty$
+    { "" }
+    { address empty$
+        { organization }
+        { organization add.colon address *}
+      if$
+    }
+  if$
+}
+
 FUNCTION {format.pub.address}
 { publisher empty$
     { "" }
@@ -1259,15 +1267,17 @@ FUNCTION {techreport}
   title format.title "title" output.check
   new.block
   type empty$
-    'bbl.techreport
-    'type
-  if$
-  number empty$
     'skip$
-    { number tie.or.space.connect }
+    {
+      type
+      number empty$
+        'skip$
+        { number tie.or.space.connect }
+      if$
+      output
+    }
   if$
-  output
-  format.pub.address output
+  format.org.address output
   format.bdate "year" output.check
   pages empty$
     'skip$