From 8a1312018c13f3d29de8d1e5899410f8d0099043 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Feb 2015 23:29:37 +0000 Subject: achemso (2feb15) git-svn-id: svn://tug.org/texlive/trunk@36196 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/achemso/achemso.bst | 32 ++++++++++++++++++------ Master/texmf-dist/bibtex/bst/achemso/biochem.bst | 32 ++++++++++++++++++------ 2 files changed, 48 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/bibtex/bst') diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst index f76f3d2771e..67b79ddb5db 100644 --- a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst +++ b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst @@ -23,6 +23,7 @@ ENTRY chapter ctrl-article-title ctrl-chapter-title + ctrl-doi ctrl-etal-firstonly ctrl-etal-number ctrl-use-title @@ -656,6 +657,7 @@ FUNCTION { count.entries } { FUNCTION { begin.bib } { + "achemso 2015/02/01 v3.9" top$ preamble$ empty$ { } { @@ -717,6 +719,7 @@ FUNCTION { end.bib } { INTEGERS { ctrl.article.title.bool ctrl.chapter.title.bool + ctrl.doi.bool ctrl.etal.firstonly.bool ctrl.etal.number.int } @@ -724,6 +727,7 @@ INTEGERS { FUNCTION { initialize.control.values } { #0 'ctrl.article.title.bool := #0 'ctrl.chapter.title.bool := + #0 'ctrl.doi.bool := #1 'ctrl.etal.firstonly.bool := #15 'ctrl.etal.number.int := } @@ -731,6 +735,7 @@ FUNCTION { initialize.control.values } { FUNCTION { control } { ctrl-article-title yes.no.to.bool 'ctrl.article.title.bool := ctrl-chapter-title yes.no.to.bool 'ctrl.chapter.title.bool := + ctrl-doi yes.no.to.bool 'ctrl.doi.bool := ctrl-etal-firstonly yes.no.to.bool 'ctrl.etal.firstonly.bool := ctrl-etal-number str.to.int 'ctrl.etal.number.int := ctrl-use-title empty$ @@ -1076,10 +1081,14 @@ FUNCTION { format.chapter } { } FUNCTION { format.doi } { - next.punct.comma 'next.punct.int := - bbl.doi add.space - doi * - output + doi empty$ + 'skip$ + { + bbl.doi add.space + doi * + output + } + if$ } FUNCTION { format.edition } { @@ -1191,6 +1200,10 @@ FUNCTION { format.pages } { output } if$ + ctrl.doi.bool + { format.doi } + 'skip$ + if$ } FUNCTION { format.pages.article } { @@ -1201,6 +1214,10 @@ FUNCTION { format.pages.article } { output } if$ + ctrl.doi.bool + { format.doi } + 'skip$ + if$ } FUNCTION { format.publisher.address } { @@ -1283,9 +1300,6 @@ FUNCTION { format.title.booktitle } { if$ } -FUNCTION { format.chapter.title } { -} - STRINGS { book.title chapter.title @@ -1486,6 +1500,7 @@ FUNCTION { inpress } { } { format.year.article + next.punct.comma 'next.punct.int := format.doi } if$ @@ -1590,6 +1605,7 @@ FUNCTION { unpublished } { { format.howpublished } { format.year + next.punct.comma 'next.punct.int := format.doi } if$ @@ -1676,7 +1692,7 @@ EXECUTE { end.bib } %% %% Originally developed by Mats Dahlgren %% Copyright (C) 1996-1998 by Mats Dahlgren -%% Copyright (C) 2008-2014 by +%% Copyright (C) 2008-2015 by %% Joseph Wright %% %% Part of this bundle is derived from cite.sty, to which the diff --git a/Master/texmf-dist/bibtex/bst/achemso/biochem.bst b/Master/texmf-dist/bibtex/bst/achemso/biochem.bst index bd07e14190b..b6885438689 100644 --- a/Master/texmf-dist/bibtex/bst/achemso/biochem.bst +++ b/Master/texmf-dist/bibtex/bst/achemso/biochem.bst @@ -23,6 +23,7 @@ ENTRY chapter ctrl-article-title ctrl-chapter-title + ctrl-doi ctrl-etal-firstonly ctrl-etal-number ctrl-use-title @@ -656,6 +657,7 @@ FUNCTION { count.entries } { FUNCTION { begin.bib } { + "achemso 2015/02/01 v3.9" top$ preamble$ empty$ { } { @@ -717,6 +719,7 @@ FUNCTION { end.bib } { INTEGERS { ctrl.article.title.bool ctrl.chapter.title.bool + ctrl.doi.bool ctrl.etal.firstonly.bool ctrl.etal.number.int } @@ -724,6 +727,7 @@ INTEGERS { FUNCTION { initialize.control.values } { #1 'ctrl.article.title.bool := #0 'ctrl.chapter.title.bool := + #0 'ctrl.doi.bool := #1 'ctrl.etal.firstonly.bool := #15 'ctrl.etal.number.int := } @@ -731,6 +735,7 @@ FUNCTION { initialize.control.values } { FUNCTION { control } { ctrl-article-title yes.no.to.bool 'ctrl.article.title.bool := ctrl-chapter-title yes.no.to.bool 'ctrl.chapter.title.bool := + ctrl-doi yes.no.to.bool 'ctrl.doi.bool := ctrl-etal-firstonly yes.no.to.bool 'ctrl.etal.firstonly.bool := ctrl-etal-number str.to.int 'ctrl.etal.number.int := ctrl-use-title empty$ @@ -1080,10 +1085,14 @@ FUNCTION { format.chapter } { } FUNCTION { format.doi } { - next.punct.comma 'next.punct.int := - bbl.doi add.space - doi * - output + doi empty$ + 'skip$ + { + bbl.doi add.space + doi * + output + } + if$ } FUNCTION { format.edition } { @@ -1195,6 +1204,10 @@ FUNCTION { format.pages } { output } if$ + ctrl.doi.bool + { format.doi } + 'skip$ + if$ } FUNCTION { format.pages.article } { @@ -1205,6 +1218,10 @@ FUNCTION { format.pages.article } { output } if$ + ctrl.doi.bool + { format.doi } + 'skip$ + if$ } FUNCTION { format.publisher.address } { @@ -1287,9 +1304,6 @@ FUNCTION { format.title.booktitle } { if$ } -FUNCTION { format.chapter.title } { -} - STRINGS { book.title chapter.title @@ -1491,6 +1505,7 @@ FUNCTION { inpress } { output } { + next.punct.comma 'next.punct.int := format.doi } if$ @@ -1595,6 +1610,7 @@ FUNCTION { unpublished } { { format.howpublished } { format.year + next.punct.comma 'next.punct.int := format.doi } if$ @@ -1681,7 +1697,7 @@ EXECUTE { end.bib } %% %% Originally developed by Mats Dahlgren %% Copyright (C) 1996-1998 by Mats Dahlgren -%% Copyright (C) 2008-2014 by +%% Copyright (C) 2008-2015 by %% Joseph Wright %% %% Part of this bundle is derived from cite.sty, to which the -- cgit v1.2.3