achemso 3.7 (30apr12)

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

2 files changed, 40 insertions, 10 deletions

diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
index 68b192791ab..886a8ca1841 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
@@ -21,6 +21,8 @@ ENTRY
     author
     booktitle
     chapter
+    ctrl-article-title
+    ctrl-chapter-title
     ctrl-etal-firstonly
     ctrl-etal-number
     ctrl-use-title
@@ -711,21 +713,25 @@ FUNCTION { end.bib } {
 
 
 INTEGERS {
-  ctrl.use.title.bool
+  ctrl.article.title.bool
+  ctrl.chapter.title.bool
   ctrl.etal.firstonly.bool
   ctrl.etal.number.int
 }
 
 FUNCTION { initialize.control.values } {
-  #0 'ctrl.use.title.bool :=
+  #0 'ctrl.article.title.bool :=
+  #0 'ctrl.chapter.title.bool :=
   #1 'ctrl.etal.firstonly.bool :=
   #15 'ctrl.etal.number.int :=
 }
 
 FUNCTION { control } {
-  ctrl-use-title yes.no.to.bool 'ctrl.use.title.bool :=
+  ctrl-article-title  yes.no.to.bool 'ctrl.article.title.bool  :=
+  ctrl-chapter-title  yes.no.to.bool 'ctrl.chapter.title.bool  :=
   ctrl-etal-firstonly yes.no.to.bool 'ctrl.etal.firstonly.bool :=
-  ctrl-etal-number str.to.int 'ctrl.etal.number.int :=
+  ctrl-etal-number    str.to.int     'ctrl.etal.number.int     :=
+  ctrl-use-title      yes.no.to.bool 'ctrl.article.title.bool  :=
 }
 
 
@@ -1226,7 +1232,7 @@ FUNCTION { format.title } {
 }
 
 FUNCTION { format.title.article } {
-  ctrl.use.title.bool
+  ctrl.article.title.bool
     {
       title empty$
         { }
@@ -1287,6 +1293,15 @@ FUNCTION { format.title.booktitle.book } {
       title 'book.title :=
     }
     {
+      ctrl.chapter.title.bool
+        {
+          title empty$
+            'skip$
+            { title 'chapter.title := }
+          if$
+        }
+        'skip$
+      if$
       maintitle empty$
         { booktitle 'book.title := }
         { maintitle add.period booktitle * 'book.title := }
diff --git a/Master/texmf-dist/bibtex/bst/achemso/biochem.bst b/Master/texmf-dist/bibtex/bst/achemso/biochem.bst
index 207bfd8357f..870d62d83bf 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/biochem.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/biochem.bst
@@ -21,6 +21,8 @@ ENTRY
     author
     booktitle
     chapter
+    ctrl-article-title
+    ctrl-chapter-title
     ctrl-etal-firstonly
     ctrl-etal-number
     ctrl-use-title
@@ -711,21 +713,25 @@ FUNCTION { end.bib } {
 
 
 INTEGERS {
-  ctrl.use.title.bool
+  ctrl.article.title.bool
+  ctrl.chapter.title.bool
   ctrl.etal.firstonly.bool
   ctrl.etal.number.int
 }
 
 FUNCTION { initialize.control.values } {
-  #1 'ctrl.use.title.bool :=
+  #1 'ctrl.article.title.bool :=
+  #0 'ctrl.chapter.title.bool :=
   #1 'ctrl.etal.firstonly.bool :=
   #15 'ctrl.etal.number.int :=
 }
 
 FUNCTION { control } {
-  ctrl-use-title yes.no.to.bool 'ctrl.use.title.bool :=
+  ctrl-article-title  yes.no.to.bool 'ctrl.article.title.bool  :=
+  ctrl-chapter-title  yes.no.to.bool 'ctrl.chapter.title.bool  :=
   ctrl-etal-firstonly yes.no.to.bool 'ctrl.etal.firstonly.bool :=
-  ctrl-etal-number str.to.int 'ctrl.etal.number.int :=
+  ctrl-etal-number    str.to.int     'ctrl.etal.number.int     :=
+  ctrl-use-title      yes.no.to.bool 'ctrl.article.title.bool  :=
 }
 
 
@@ -1230,7 +1236,7 @@ FUNCTION { format.title } {
 }
 
 FUNCTION { format.title.article } {
-  ctrl.use.title.bool
+  ctrl.article.title.bool
     {
       title empty$
         { }
@@ -1291,6 +1297,15 @@ FUNCTION { format.title.booktitle.book } {
       title 'book.title :=
     }
     {
+      ctrl.chapter.title.bool
+        {
+          title empty$
+            'skip$
+            { title 'chapter.title := }
+          if$
+        }
+        'skip$
+      if$
       maintitle empty$
         { booktitle 'book.title := }
         { maintitle add.period booktitle * 'book.title := }