summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-11 22:51:55 +0000
committerKarl Berry <karl@freefriends.org>2015-01-11 22:51:55 +0000
commit2233571344ea7ec342d035bf6ec1e54909c604de (patch)
treefcbb39ae54eeab8a9c99be3abff09aaf6e9b6596 /Master/texmf-dist/bibtex
parent9a32a7a9d63c685e263389fb8d77f6fc7fce616a (diff)
ametsoc (11jan15)
git-svn-id: svn://tug.org/texlive/trunk@36030 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/ametsoc/ametsoc2014.bst (renamed from Master/texmf-dist/bibtex/bst/ametsoc/ametsoc.bst)129
1 files changed, 71 insertions, 58 deletions
diff --git a/Master/texmf-dist/bibtex/bst/ametsoc/ametsoc.bst b/Master/texmf-dist/bibtex/bst/ametsoc/ametsoc2014.bst
index 19709734170..4fb598c3633 100644
--- a/Master/texmf-dist/bibtex/bst/ametsoc/ametsoc.bst
+++ b/Master/texmf-dist/bibtex/bst/ametsoc/ametsoc2014.bst
@@ -1,14 +1,16 @@
+%% Updated 7 May 2014
%%
-%% This is file `ametsoc_V2.bst',
+%% This is file `ametsoc_2014.bst',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% merlin.mbs (with options: `ay,nat,nm-rev1,jnrlst,nmlm,x8,m1,keyxyr,dt-beg,yr-com,yrp-col,note-yr,thtit-a,vol-2bf,vnum-sp,volp-com,pgsep-s,num-xser,numser,ser-vol,bkpg-x,pg-bk,pre-edn,agu-doi,doi,edparc,bkedcap,edby,edbyy,blk-tit,in-x,pp,ed,abr,ednx,ord,jabr,eprint,url,url-nt,em-it,nfss,')
%% ----------------------------------------
-%% *** Bibliography style for all AMS Journals BAMS ***
+%% *** Bibliography style for all AMS Journals and BAMS ***
%%
%% Copyright 1994-2005 Patrick W Daly
+%% Updated 2014 Nicole Rietmann
% ===============================================================
% IMPORTANT NOTICE:
% This bibliographic style (bst) file has been generated from one or
@@ -41,11 +43,11 @@
% The \cite command functions as follows:
% \citet{key} ==>> Jones et al. (1990)
% \citet*{key} ==>> Jones, Baker, and Smith (1990)
- % \citep{key} ==>> (Jones et al., 1990)
+ % \citep{key} ==>> (Jones et al. 1990)
% \citep*{key} ==>> (Jones, Baker, and Smith, 1990)
- % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2)
- % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990)
- % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32)
+ % \citep[chap. 2]{key} ==>> (Jones et al. 1990, chap. 2)
+ % \citep[e.g.,][]{key} ==>> (e.g., Jones et al. 1990)
+ % \citep[e.g.,][p. 32]{key} ==>> (e.g., Jones et al., p. 32)
% \citeauthor{key} ==>> Jones et al.
% \citeauthor*{key} ==>> Jones, Baker, and Smith
% \citeyear{key} ==>> 1990
@@ -216,6 +218,9 @@ FUNCTION {space.word}
FUNCTION {bbl.and}
{ "and"}
+FUNCTION {bbl.cand}
+{ ", and"}
+
FUNCTION {bbl.etal}
{ "et~al." }
@@ -268,10 +273,10 @@ FUNCTION {bbl.first}
{ "1st" }
FUNCTION {bbl.second}
-{ "2d" }
+{ "2nd" }
FUNCTION {bbl.third}
-{ "3d" }
+{ "3rd" }
FUNCTION {bbl.fourth}
{ "4th" }
@@ -283,10 +288,10 @@ FUNCTION {bbl.st}
{ "st" }
FUNCTION {bbl.nd}
-{ "d" }
+{ "nd" }
FUNCTION {bbl.rd}
-{ "d" }
+{ "rd" }
FUNCTION {bbl.th}
{ "th" }
@@ -457,23 +462,9 @@ FUNCTION {format.names}
if$
namesleft #1 >
{ ", " * t * }
- {
- s nameptr "{ll}" format.name$ duplicate$ "others" =
- { 't := }
- { pop$ }
- if$
- numnames #2 >
- { "," * }
- 'skip$
- if$
- t "others" =
- {
- " " * bbl.etal *
- }
- {
- bbl.and
- space.word * t *
- }
+ { t "others" =
+ { ", and Coauthors" * }
+ { ", and " * t * }
if$
}
if$
@@ -504,25 +495,10 @@ FUNCTION {format.names.ed}
nameptr #1 >
{
namesleft #1 >
- { ", " * t * }
- {
- s nameptr "{ll}" format.name$ duplicate$ "others" =
- { 't := }
- { pop$ }
- if$
- numnames #2 >
- { "," * }
- 'skip$
- if$
- t "others" =
- {
-
- " " * bbl.etal *
- }
- {
- bbl.and
- space.word * t *
- }
+ { ", " * t * }
+ { t "others" =
+ { " et~al." * }
+ { ", and " * t * }
if$
}
if$
@@ -555,11 +531,14 @@ FUNCTION {format.editors}
" " *
get.bbl.editor
capitalize
- "(" swap$ * ")" *
+ % " " swap$ * "," *
*
}
if$
}
+FUNCTION {format.conf.pages}
+{ pages "pages" bibinfo.check}
+
FUNCTION {format.book.pages}
{ pages "pages" bibinfo.check
duplicate$ empty$ 'skip$
@@ -640,8 +619,8 @@ FUNCTION {format.full.names}
{ "," * }
'skip$
if$
- bbl.and
- space.word * t *
+ ", and "
+ * t *
}
if$
}
@@ -835,7 +814,7 @@ FUNCTION {format.number.series}
{ bbl.number capitalize }
if$
number tie.or.space.prefix "number" bibinfo.check * *
- bbl.in space.word *
+ "," * " " *
series "series" bibinfo.check *
}
if$
@@ -1020,6 +999,10 @@ FUNCTION {format.booktitle}
booktitle "booktitle" bibinfo.check
emphasize
}
+FUNCTION {format.bktitle}
+{
+ booktitle "booktitle" bibinfo.check
+}
FUNCTION {format.in.ed.booktitle}
{ format.booktitle duplicate$ empty$ 'skip$
{
@@ -1136,7 +1119,7 @@ FUNCTION {book}
author empty$
{ format.editors "author and editor" output.check
editor format.key output
- add.blank
+ %add.blank
}
{ format.authors output.nonnull
crossref missing$
@@ -1167,7 +1150,6 @@ FUNCTION {book}
fin.entry
}
-
FUNCTION {booklet}
{ output.bibitem
format.authors output
@@ -1232,10 +1214,10 @@ FUNCTION {incollection}
new.sentence
crossref missing$
{ format.in.ed.booktitle "booktitle" output.check
- format.publisher.address output
- format.bvolume output
- format.number.series output
+ format.bvolume output
+ format.number.series output
format.edition output
+ format.publisher.address output
format.chapter.pages output
}
{ format.incoll.inproc.crossref output.nonnull
@@ -1279,7 +1261,37 @@ FUNCTION {inproceedings}
format.eprint output
fin.entry
}
-FUNCTION {conference} { inproceedings }
+FUNCTION {conference}
+{ output.bibitem
+ format.authors "author" output.check
+ author format.key output
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ new.sentence
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+
+ publisher empty$
+ { format.organization.address output }
+ { format.publisher.address output
+ organization "organization" bibinfo.check output
+ }
+ if$
+ format.bvolume output
+ howpublished "howpublished" bibinfo.check output
+ format.conf.pages output
+ format.number.series output
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.conf.pages output
+ }
+ if$
+ format.doi output
+ format.note output
+ format.eprint output
+ fin.entry
+}
FUNCTION {manual}
{ output.bibitem
format.authors output
@@ -1332,7 +1344,6 @@ FUNCTION {misc}
format.book.pages output
howpublished "howpublished" bibinfo.check output
format.doi output
- format.note output
format.eprint output
fin.entry
}
@@ -1404,8 +1415,8 @@ FUNCTION {techreport}
format.tr.number output.nonnull
howpublished "howpublished" bibinfo.check output
institution "institution" bibinfo.warn output
+address "address" bibinfo.check output
format.book.pages output
- address "address" bibinfo.check output
new.sentence
format.doi output
format.note output
@@ -1708,6 +1719,8 @@ FUNCTION {begin.bib}
write$ newline$
"\providecommand{\url}[1]{\texttt{#1}}"
write$ newline$
+ "\renewcommand{\UrlFont}{\rmfamily}"
+ write$ newline$
"\providecommand{\urlprefix}{URL }"
write$ newline$
"\expandafter\ifx\csname urlstyle\endcsname\relax"