besjournals (22oct14)

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

1 files changed, 31 insertions, 40 deletions

diff --git a/Master/texmf-dist/bibtex/bst/besjournals/besjournals.bst b/Master/texmf-dist/bibtex/bst/besjournals/besjournals.bst
index eecbbdc1573..beec0045d52 100644
--- a/Master/texmf-dist/bibtex/bst/besjournals/besjournals.bst
+++ b/Master/texmf-dist/bibtex/bst/besjournals/besjournals.bst
@@ -4,16 +4,16 @@
 %%
 %% The original source files were:
 %%
-%% merlin.mbs  (with options: `head,ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,url,url-blk,nfss,,{}')
-%% physjour.mbs  (with options: `ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,url,url-blk,nfss,,{}')
-%% geojour.mbs  (with options: `ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,url,url-blk,nfss,,{}')
-%% photjour.mbs  (with options: `ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,url,url-blk,nfss,,{}')
-%% merlin.mbs  (with options: `tail,ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,url,url-blk,nfss,,{}')
+%% merlin.mbs  (with options: `head,ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,nfss,,{}')
+%% physjour.mbs  (with options: `ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,nfss,,{}')
+%% geojour.mbs  (with options: `ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,nfss,,{}')
+%% photjour.mbs  (with options: `ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,nfss,,{}')
+%% merlin.mbs  (with options: `tail,ay,nat,nm-rvvc,jnrlab,keyxyr,dt-beg,yr-par,yrp-x,note-yr,vol-bf,vnum-x,volp-com,num-xser,jnm-x,edpar,edby-par,edbyx,blk-tit,in-x,pp,ed,abr,xedn,amper,and-xcom,etal-xc,etal-it,nfss,,{}')
 %% ----------------------------------------
 %% *** BibTeX style (bst) for Functional Ecology ***
 %% Created by Og DeSouza <og.souza@ufv.br>
 %% using custom-bib
-%% Copyright 1994-2005 Patrick W Daly
+%% Copyright 1994-2011 Patrick W Daly
  % ===============================================================
  % IMPORTANT NOTICE:
  % This bibliographic style (bst) file has been generated from one or
@@ -25,7 +25,7 @@
  % version 1 of the License, or any later version.
  % ===============================================================
  % Name and version information of the main mbs file:
- % \ProvidesFile{merlin.mbs}[2005/10/17 4.14 (PWD, AO, DPC)]
+ % \ProvidesFile{merlin.mbs}[2011/11/18 4.33 (PWD, AO, DPC)]
  %   For use with BibTeX version 0.99a or later
  %-------------------------------------------------------------------
  % This bibliography style file is intended for texts in ENGLISH
@@ -50,7 +50,7 @@
  %   \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[e.g.][p. 32]{key} ==>>   (e.g. Jones et al., 1990, p. 32)
  %   \citeauthor{key} ==>>           Jones et al.
  %   \citeauthor*{key} ==>>          Jones, Baker, and Smith
  %   \citeyear{key} ==>>             1990
@@ -78,7 +78,6 @@ ENTRY
     series
     title
     type
-    url
     volume
     year
   }
@@ -534,7 +533,7 @@ MACRO {CLEO} {"Conf. on Lasers and Electro-Optics"}
 MACRO {ASSL} {"Advanced Solid State Lasers"}
 MACRO {OSA}  {"Optical Society of America"}
  % End module: photjour.mbs
-%% Copyright 1994-2005 Patrick W Daly
+%% Copyright 1994-2011 Patrick W Daly
 MACRO {acmcs} {"ACM Computing Surveys"}
 
 MACRO {acta} {"Acta Informatica"}
@@ -611,15 +610,10 @@ FUNCTION {bibinfo.warn}
     }
   if$
 }
-FUNCTION {format.url}
-{ url empty$
-    { "" }
-    { "\urlprefix\url{" url * "}" * }
-  if$
-}
+INTEGERS { nameptr namesleft numnames }
+
 
 STRINGS  { bibinfo}
-INTEGERS { nameptr namesleft numnames }
 
 FUNCTION {format.names}
 { 'bibinfo :=
@@ -766,7 +760,7 @@ FUNCTION {format.full.names}
   numnames 'namesleft :=
     { namesleft #0 > }
     { s nameptr
-      "{vv~}{ll}" format.name$
+      "{vv~}{ll}{, jj}" format.name$
       't :=
       nameptr #1 >
         {
@@ -1175,7 +1169,6 @@ FUNCTION {article}
       format.pages output
     }
   if$
-  format.url output
   format.note output
   fin.entry
 }
@@ -1207,7 +1200,6 @@ FUNCTION {book}
     }
   if$
   format.edition output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1221,7 +1213,6 @@ FUNCTION {booklet}
   new.sentence
   howpublished "howpublished" bibinfo.check output
   address "address" bibinfo.check output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1257,7 +1248,6 @@ FUNCTION {inbook}
     }
   if$
   format.edition output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1282,7 +1272,6 @@ FUNCTION {incollection}
       format.chapter.pages output
     }
   if$
-  format.url output
   format.note output
   fin.entry
 }
@@ -1310,7 +1299,6 @@ FUNCTION {inproceedings}
       format.pages output
     }
   if$
-  format.url output
   format.note output
   fin.entry
 }
@@ -1326,7 +1314,6 @@ FUNCTION {manual}
   organization "organization" bibinfo.check output
   address "address" bibinfo.check output
   format.edition output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1343,7 +1330,6 @@ FUNCTION {mastersthesis}
   bbl.mthesis format.thesis.type output.nonnull
   school "school" bibinfo.warn output
   address "address" bibinfo.check output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1357,7 +1343,6 @@ FUNCTION {misc}
   format.title output
   new.sentence
   howpublished "howpublished" bibinfo.check output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1373,7 +1358,6 @@ FUNCTION {phdthesis}
   bbl.phdthesis format.thesis.type output.nonnull
   school "school" bibinfo.warn output
   address "address" bibinfo.check output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1393,7 +1377,6 @@ FUNCTION {proceedings}
       format.publisher.address output
     }
   if$
-  format.url output
   format.note output
   fin.entry
 }
@@ -1410,7 +1393,6 @@ FUNCTION {techreport}
   format.tr.number output.nonnull
   institution "institution" bibinfo.warn output
   address "address" bibinfo.check output
-  format.url output
   format.note output
   fin.entry
 }
@@ -1422,7 +1404,6 @@ FUNCTION {unpublished}
   format.date "year" output.check
   date.block
   format.title "title" output.check
-  format.url output
   format.note "note" output.check
   fin.entry
 }
@@ -1539,15 +1520,16 @@ FUNCTION {sort.format.names}
   numnames 'namesleft :=
     { namesleft #0 > }
     { s nameptr
-      "{vv{ } }{ll{ }}{  ff{ }}{  jj{ }}"
+      "{vv{ } }{ll{ }}{  f{ }}{  jj{ }}"
       format.name$ 't :=
       nameptr #1 >
         {
           "   "  *
           namesleft #1 = t "others" = and
-            { "zzzzz" * }
-            { t sortify * }
+            { "zzzzz" 't := }
+            'skip$
           if$
+          t sortify *
         }
         { t sortify * }
       if$
@@ -1638,17 +1620,30 @@ FUNCTION {presort}
 ITERATE {presort}
 SORT
 STRINGS { last.label next.extra }
-INTEGERS { last.extra.num number.label }
+INTEGERS { last.extra.num last.extra.num.extended last.extra.num.blank number.label }
 FUNCTION {initialize.extra.label.stuff}
 { #0 int.to.chr$ 'last.label :=
   "" 'next.extra :=
   #0 'last.extra.num :=
+  "a" chr.to.int$ #1 - 'last.extra.num.blank :=
+  last.extra.num.blank 'last.extra.num.extended :=
   #0 'number.label :=
 }
 FUNCTION {forward.pass}
 { last.label label =
     { last.extra.num #1 + 'last.extra.num :=
-      last.extra.num int.to.chr$ 'extra.label :=
+      last.extra.num "z" chr.to.int$ >
+       { "a" chr.to.int$ 'last.extra.num :=
+         last.extra.num.extended #1 + 'last.extra.num.extended :=
+       }
+       'skip$
+      if$
+      last.extra.num.extended last.extra.num.blank >
+        { last.extra.num.extended int.to.chr$
+          last.extra.num int.to.chr$
+          * 'extra.label := }
+        { last.extra.num int.to.chr$ 'extra.label := }
+      if$
     }
     { "a" chr.to.int$ 'last.extra.num :=
       "" 'extra.label :=
@@ -1699,10 +1694,6 @@ FUNCTION {begin.bib}
   write$ newline$
   "\providecommand{\natexlab}[1]{#1}"
   write$ newline$
-  "\providecommand{\url}[1]{\texttt{#1}}"
-  write$ newline$
-  "\providecommand{\urlprefix}{URL }"
-  write$ newline$
 }
 EXECUTE {begin.bib}
 EXECUTE {init.state.consts}