diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-11 00:46:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-11 00:46:42 +0000 |
commit | 58d31edb0a4d32f223ea9e65277982ba88f145a3 (patch) | |
tree | dd214c0eb92e92e65d177567fee9d0836569f72d /Master/texmf-dist/bibtex | |
parent | 7a4867398aac7e40c1ebf080c02bcd8b8f2f64b1 (diff) |
revtex 4.1p2 (13aug10)
git-svn-id: svn://tug.org/texlive/trunk@19652 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r-- | Master/texmf-dist/bibtex/bst/revtex/aipauth4-1.bst | 175 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bst/revtex/aipnum4-1.bst | 175 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bst/revtex/apsrev4-1.bst | 121 | ||||
-rw-r--r-- | Master/texmf-dist/bibtex/bst/revtex/apsrmp4-1.bst | 121 |
4 files changed, 208 insertions, 384 deletions
diff --git a/Master/texmf-dist/bibtex/bst/revtex/aipauth4-1.bst b/Master/texmf-dist/bibtex/bst/revtex/aipauth4-1.bst index 797719716b8..97a52a3044a 100644 --- a/Master/texmf-dist/bibtex/bst/revtex/aipauth4-1.bst +++ b/Master/texmf-dist/bibtex/bst/revtex/aipauth4-1.bst @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,vonx,nm-rev,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,vonx,nm-rev,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,vonx,nm-rev,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,vonx,nm-rev,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') %% ---------------------------------------- -%% *** REVTeX-compatible aipauth4-1.bst 2009-10-25 *** +%% *** REVTeX-compatible aipauth4-1.bst 2010-07-25 *** %% %% Copyright 1994-2007 Patrick W Daly % =============================================================== @@ -54,7 +54,7 @@ % \citeyear{key} ==>> 1990 %--------------------------------------------------------------------- -FUNCTION {id.bst} {"merlin.mbs 2010-03-15 4.21a (PWD, AO, DPC)"} +FUNCTION {id.bst} {"merlin.mbs aipauth4-1.bst 2010-07-25 4.21a (PWD, AO, DPC) hacked"} ENTRY { address @@ -1510,6 +1510,7 @@ FUNCTION {format.names.morfont} { bib.fname.font ", " swap$ * } if$ } { + "," * s nameptr format.names.fname "jj" @@ -1779,25 +1780,12 @@ FUNCTION {format.editors} if$ } -FUNCTION {format.isbn} +FUNCTION {format.isbn.output} { - isbn "isbn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISBN " swap$ * - } - if$ } -FUNCTION {format.issn} -{ issn "issn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISSN " swap$ * - } - if$ +FUNCTION {format.issn.output} +{ } FUNCTION {doi.base} @@ -1805,19 +1793,14 @@ FUNCTION {doi.base} "http://dx.doi.org/" } -FUNCTION {noop.command} +FUNCTION {doi.base.command} { - "\href@noop " + "\doibase " } -FUNCTION {doi.command} -{ - "\doi " -} - -FUNCTION {doi.command.href} +FUNCTION {noop.command} { - "\Doi " + "\href@noop " } FUNCTION {href.command} @@ -1825,38 +1808,6 @@ FUNCTION {href.command} "\href " } -FUNCTION {format.doi} -{ doi - duplicate$ empty$ 'skip$ - { - new.block.comma - doi.command "{" * swap$ * "}" * - } - if$ -} - -FUNCTION {add.doi.old} -{ - duplicate$ empty$ 'skip$ - { - doi duplicate$ empty$ - { - pop$ - url duplicate$ empty$ - { - pop$ - }{ - href.command " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - { - doi.command.href " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - if$ -} FUNCTION {link.tag.open} { doi duplicate$ empty$ @@ -1871,7 +1822,8 @@ FUNCTION {link.tag.open} if$ } { - doi.command.href + doi.base.command swap$ * + href.command } if$ "{" * swap$ * "} {" * @@ -2055,7 +2007,7 @@ FUNCTION {output.bibitem} newline$ "" label - * + * ")" * make.full.names duplicate$ short.list = { pop$ }{ * } if$ bracify @@ -2666,20 +2618,21 @@ FUNCTION {article} "journal" bibinfo.warn "journal" 'bibfield := output + add.blank format.ser.vol.num output eid.or.pages format.date.output.check + pages empty$ { + doi output + } 'skip$ if$ link.shut }{ format.article.crossref output.nonnull format.pages output } if$ - format.issn output - pages empty$ { - format.doi output - } 'skip$ if$ + format.issn.output new.block.comma new.sentence.comma format.note output @@ -2725,7 +2678,7 @@ FUNCTION {book} format.date.output.check } if$ - format.isbn output + format.isbn.output format.chapter.pages output new.block.comma @@ -2748,7 +2701,7 @@ FUNCTION {booklet} howpublished "howpublished" bibinfo.check output address "address" bibinfo.check output format.date.output - format.isbn output + format.isbn.output format.book.pages output new.block.comma new.sentence.comma @@ -2799,7 +2752,7 @@ FUNCTION {inbook} } if$ crossref missing$ - { format.isbn output } + { format.isbn.output } 'skip$ if$ new.block.comma @@ -2821,7 +2774,7 @@ FUNCTION {incollection} format.publisher.address output format.edition output format.chapter.pages output - format.isbn output + format.isbn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2845,8 +2798,8 @@ FUNCTION {inproceedings} format.in.ed.booktitle format.organization.publisher.address output format.chapter.pages output - format.isbn output - format.issn output + format.isbn.output + format.issn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2979,8 +2932,8 @@ FUNCTION {proceedings} format.number.series output format.bvolume output format.organization.publisher.address output - format.isbn output - format.issn output + format.isbn.output + format.issn.output new.block.comma new.sentence.comma format.note output @@ -3063,29 +3016,51 @@ FUNCTION {format.lab.names} { 's := "" 't := #1 'nameptr := - format.name.apply - s num.names$ duplicate$ - #2 > - { pop$ - cite.name.font.apply - }{ - #2 < - 'skip$ + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { + format.name.apply + 't := + nameptr #1 > { - s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = + nameptr + #2 + = + numnames + #3 + > and + { + "others" 't := + #1 'namesleft := + } + 'skip$ + if$ + namesleft #1 > + { ", " * t * } { - cite.name.font.apply - }{ - bbl.and space.word * - s #2 "{vv~}{ll}" format.name$ - cite.name.font - * + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + cite.name.font.apply + }{ + numnames #2 > { "," * } 'skip$ if$ + bbl.and + space.word * t * + } + if$ } if$ } + 't if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := } - if$ + while$ } FUNCTION {author.key.label} @@ -3150,7 +3125,7 @@ FUNCTION {calc.label} control.year #0 > { purify$ #-1 #4 substring$ } 'skip$ if$ } if$ - "(" swap$ * ")" * + "(" swap$ * * 'label := } @@ -3384,16 +3359,7 @@ FUNCTION {init.bib.eprint} FUNCTION {init.bib.doi} { - "\@ifxundefined \urlstyle {%" write$ newline$ - " \providecommand " doi.command " [0]{\begingroup \@sanitize@url \@doi}%" * * write$ newline$ - " \providecommand \@doi [1]{\endgroup \@@startlink {\doibase #1}doi:\discretionary {}{}{}#1\@@endlink }%" write$ newline$ - "}{%" write$ newline$ - " \providecommand " doi.command " [0]{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url }%" * * write$ newline$ - "}%" write$ newline$ "\providecommand \doibase [0]{" doi.base "}%" * * write$ newline$ - "\providecommand " doi.command.href "[0]{\begingroup \@sanitize@url \@Doi }%" * * write$ newline$ - "\providecommand \@Doi [1]{\endgroup\@@startlink{\doibase#1}\@@Doi}%" write$ newline$ - "\providecommand \@@Doi [1]{#1\@@endlink}%" write$ newline$ } FUNCTION {init.bib.hypertex} @@ -3483,6 +3449,7 @@ FUNCTION {init.bib} init.bib.translation init.bib.endbibitem "\providecommand " bbl.shut * " [1]{\csname bibitem#1\endcsname}%" * write$ newline$ + "\let\auto@bib@innerbib\@empty" write$ newline$ "%</preamble>" write$ } diff --git a/Master/texmf-dist/bibtex/bst/revtex/aipnum4-1.bst b/Master/texmf-dist/bibtex/bst/revtex/aipnum4-1.bst index 1c08fb60c2f..5233cc659d7 100644 --- a/Master/texmf-dist/bibtex/bst/revtex/aipnum4-1.bst +++ b/Master/texmf-dist/bibtex/bst/revtex/aipnum4-1.bst @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,mcite,mct-1,mct-x3,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,blkyear,yr-par,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') %% ---------------------------------------- -%% *** REVTeX-compatible aipnum4-1.bst 2009-10-25 *** +%% *** REVTeX-compatible aipnum4-1.bst 2010-07-25 *** %% %% Copyright 1994-2007 Patrick W Daly % =============================================================== @@ -54,7 +54,7 @@ % \citeyear{key} ==>> 1990 %--------------------------------------------------------------------- -FUNCTION {id.bst} {"merlin.mbs 2010-03-15 4.21a (PWD, AO, DPC)"} +FUNCTION {id.bst} {"merlin.mbs aipnum4-1.bst 2010-07-25 4.21a (PWD, AO, DPC) hacked"} ENTRY { address @@ -1509,6 +1509,7 @@ FUNCTION {format.names.morfont} { bib.fname.font ", " swap$ * } if$ } { + "," * s nameptr format.names.fname "jj" @@ -1778,25 +1779,12 @@ FUNCTION {format.editors} if$ } -FUNCTION {format.isbn} +FUNCTION {format.isbn.output} { - isbn "isbn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISBN " swap$ * - } - if$ } -FUNCTION {format.issn} -{ issn "issn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISSN " swap$ * - } - if$ +FUNCTION {format.issn.output} +{ } FUNCTION {doi.base} @@ -1804,19 +1792,14 @@ FUNCTION {doi.base} "http://dx.doi.org/" } -FUNCTION {noop.command} +FUNCTION {doi.base.command} { - "\href@noop " + "\doibase " } -FUNCTION {doi.command} -{ - "\doi " -} - -FUNCTION {doi.command.href} +FUNCTION {noop.command} { - "\Doi " + "\href@noop " } FUNCTION {href.command} @@ -1824,38 +1807,6 @@ FUNCTION {href.command} "\href " } -FUNCTION {format.doi} -{ doi - duplicate$ empty$ 'skip$ - { - new.block.comma - doi.command "{" * swap$ * "}" * - } - if$ -} - -FUNCTION {add.doi.old} -{ - duplicate$ empty$ 'skip$ - { - doi duplicate$ empty$ - { - pop$ - url duplicate$ empty$ - { - pop$ - }{ - href.command " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - { - doi.command.href " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - if$ -} FUNCTION {link.tag.open} { doi duplicate$ empty$ @@ -1870,7 +1821,8 @@ FUNCTION {link.tag.open} if$ } { - doi.command.href + doi.base.command swap$ * + href.command } if$ "{" * swap$ * "} {" * @@ -2054,7 +2006,7 @@ FUNCTION {output.bibitem} newline$ "" label - * + * ")" * make.full.names duplicate$ short.list = { pop$ }{ * } if$ bracify @@ -2665,20 +2617,21 @@ FUNCTION {article} "journal" bibinfo.warn "journal" 'bibfield := output + add.blank format.ser.vol.num output eid.or.pages format.date.output.check + pages empty$ { + doi output + } 'skip$ if$ link.shut }{ format.article.crossref output.nonnull format.pages output } if$ - format.issn output - pages empty$ { - format.doi output - } 'skip$ if$ + format.issn.output new.block.comma new.sentence.comma format.note output @@ -2724,7 +2677,7 @@ FUNCTION {book} format.date.output.check } if$ - format.isbn output + format.isbn.output format.chapter.pages output new.block.comma @@ -2747,7 +2700,7 @@ FUNCTION {booklet} howpublished "howpublished" bibinfo.check output address "address" bibinfo.check output format.date.output - format.isbn output + format.isbn.output format.book.pages output new.block.comma new.sentence.comma @@ -2798,7 +2751,7 @@ FUNCTION {inbook} } if$ crossref missing$ - { format.isbn output } + { format.isbn.output } 'skip$ if$ new.block.comma @@ -2820,7 +2773,7 @@ FUNCTION {incollection} format.publisher.address output format.edition output format.chapter.pages output - format.isbn output + format.isbn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2844,8 +2797,8 @@ FUNCTION {inproceedings} format.in.ed.booktitle format.organization.publisher.address output format.chapter.pages output - format.isbn output - format.issn output + format.isbn.output + format.issn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2978,8 +2931,8 @@ FUNCTION {proceedings} format.number.series output format.bvolume output format.organization.publisher.address output - format.isbn output - format.issn output + format.isbn.output + format.issn.output new.block.comma new.sentence.comma format.note output @@ -3062,29 +3015,51 @@ FUNCTION {format.lab.names} { 's := "" 't := #1 'nameptr := - format.name.apply - s num.names$ duplicate$ - #2 > - { pop$ - cite.name.font.apply - }{ - #2 < - 'skip$ + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { + format.name.apply + 't := + nameptr #1 > { - s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = + nameptr + #2 + = + numnames + #3 + > and + { + "others" 't := + #1 'namesleft := + } + 'skip$ + if$ + namesleft #1 > + { ", " * t * } { - cite.name.font.apply - }{ - bbl.and space.word * - s #2 "{vv~}{ll}" format.name$ - cite.name.font - * + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + cite.name.font.apply + }{ + numnames #2 > { "," * } 'skip$ if$ + bbl.and + space.word * t * + } + if$ } if$ } + 't if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := } - if$ + while$ } FUNCTION {author.key.label} @@ -3149,7 +3124,7 @@ FUNCTION {calc.label} control.year #0 > { purify$ #-1 #4 substring$ } 'skip$ if$ } if$ - "(" swap$ * ")" * + "(" swap$ * * 'label := } @@ -3374,16 +3349,7 @@ FUNCTION {init.bib.eprint} FUNCTION {init.bib.doi} { - "\@ifxundefined \urlstyle {%" write$ newline$ - " \providecommand " doi.command " [0]{\begingroup \@sanitize@url \@doi}%" * * write$ newline$ - " \providecommand \@doi [1]{\endgroup \@@startlink {\doibase #1}doi:\discretionary {}{}{}#1\@@endlink }%" write$ newline$ - "}{%" write$ newline$ - " \providecommand " doi.command " [0]{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url }%" * * write$ newline$ - "}%" write$ newline$ "\providecommand \doibase [0]{" doi.base "}%" * * write$ newline$ - "\providecommand " doi.command.href "[0]{\begingroup \@sanitize@url \@Doi }%" * * write$ newline$ - "\providecommand \@Doi [1]{\endgroup\@@startlink{\doibase#1}\@@Doi}%" write$ newline$ - "\providecommand \@@Doi [1]{#1\@@endlink}%" write$ newline$ } FUNCTION {init.bib.hypertex} @@ -3473,6 +3439,7 @@ FUNCTION {init.bib} init.bib.translation init.bib.endbibitem "\providecommand " bbl.shut * " [1]{\csname bibitem#1\endcsname}%" * write$ newline$ + "\let\auto@bib@innerbib\@empty" write$ newline$ "%</preamble>" write$ } diff --git a/Master/texmf-dist/bibtex/bst/revtex/apsrev4-1.bst b/Master/texmf-dist/bibtex/bst/revtex/apsrev4-1.bst index adb16c4493b..5cd3c4cf01c 100644 --- a/Master/texmf-dist/bibtex/bst/revtex/apsrev4-1.bst +++ b/Master/texmf-dist/bibtex/bst/revtex/apsrev4-1.bst @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,isbn,issn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,seq-no,vonx,nm-init,ed-au,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,blkyear,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-x,volp-com,jpg-1,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-date,ay-empty-pub-parens-x,pre-pub,pre-edn,doi-link,doi,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') %% ---------------------------------------- -%% *** REVTeX-compatible Phys Rev 2010-02-12 *** +%% *** REVTeX-compatible Phys Rev 2010-07-25 *** %% %% Copyright 1994-2007 Patrick W Daly % =============================================================== @@ -54,7 +54,7 @@ % \citeyear{key} ==>> 1990 %--------------------------------------------------------------------- -FUNCTION {id.bst} {"merlin.mbs 2010-03-15 4.21a (PWD, AO, DPC)"} +FUNCTION {id.bst} {"merlin.mbs apsrev4-1.bst 2010-07-25 4.21a (PWD, AO, DPC) hacked"} ENTRY { address @@ -1510,6 +1510,7 @@ FUNCTION {format.names.morfont} { bib.fname.font ", " swap$ * } if$ } { + "," * s nameptr format.names.fname "jj" @@ -1779,25 +1780,12 @@ FUNCTION {format.editors} if$ } -FUNCTION {format.isbn} +FUNCTION {format.isbn.output} { - isbn "isbn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISBN " swap$ * - } - if$ } -FUNCTION {format.issn} -{ issn "issn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISSN " swap$ * - } - if$ +FUNCTION {format.issn.output} +{ } FUNCTION {doi.base} @@ -1805,19 +1793,14 @@ FUNCTION {doi.base} "http://dx.doi.org/" } -FUNCTION {noop.command} +FUNCTION {doi.base.command} { - "\href@noop " + "\doibase " } -FUNCTION {doi.command} -{ - "\doi " -} - -FUNCTION {doi.command.href} +FUNCTION {noop.command} { - "\Doi " + "\href@noop " } FUNCTION {href.command} @@ -1825,38 +1808,6 @@ FUNCTION {href.command} "\href " } -FUNCTION {format.doi} -{ doi - duplicate$ empty$ 'skip$ - { - new.block.comma - doi.command "{" * swap$ * "}" * - } - if$ -} - -FUNCTION {add.doi.old} -{ - duplicate$ empty$ 'skip$ - { - doi duplicate$ empty$ - { - pop$ - url duplicate$ empty$ - { - pop$ - }{ - href.command " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - { - doi.command.href " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - if$ -} FUNCTION {link.tag.open} { doi duplicate$ empty$ @@ -1871,7 +1822,8 @@ FUNCTION {link.tag.open} if$ } { - doi.command.href + doi.base.command swap$ * + href.command } if$ "{" * swap$ * "} {" * @@ -2055,7 +2007,7 @@ FUNCTION {output.bibitem} newline$ "" label - * + * ")" * make.full.names duplicate$ short.list = { pop$ }{ * } if$ bracify @@ -2666,20 +2618,21 @@ FUNCTION {article} "journal" bibinfo.warn "journal" 'bibfield := output + add.blank format.ser.vol.num output eid.or.pages format.date.output.check + pages empty$ { + doi output + } 'skip$ if$ link.shut }{ format.article.crossref output.nonnull format.pages output } if$ - format.issn output - pages empty$ { - format.doi output - } 'skip$ if$ + format.issn.output new.block.comma new.sentence.comma format.note output @@ -2725,7 +2678,7 @@ FUNCTION {book} format.date.output.check } if$ - format.isbn output + format.isbn.output format.chapter.pages output new.block.comma @@ -2748,7 +2701,7 @@ FUNCTION {booklet} howpublished "howpublished" bibinfo.check output address "address" bibinfo.check output format.date.output - format.isbn output + format.isbn.output format.book.pages output new.block.comma new.sentence.comma @@ -2799,7 +2752,7 @@ FUNCTION {inbook} } if$ crossref missing$ - { format.isbn output } + { format.isbn.output } 'skip$ if$ new.block.comma @@ -2821,7 +2774,7 @@ FUNCTION {incollection} format.publisher.address output format.edition output format.chapter.pages output - format.isbn output + format.isbn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2845,8 +2798,8 @@ FUNCTION {inproceedings} format.in.ed.booktitle format.organization.publisher.address output format.chapter.pages output - format.isbn output - format.issn output + format.isbn.output + format.issn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2979,8 +2932,8 @@ FUNCTION {proceedings} format.number.series output format.bvolume output format.organization.publisher.address output - format.isbn output - format.issn output + format.isbn.output + format.issn.output new.block.comma new.sentence.comma format.note output @@ -3151,7 +3104,7 @@ FUNCTION {calc.label} control.year #0 > { purify$ #-1 #4 substring$ } 'skip$ if$ } if$ - "(" swap$ * ")" * + "(" swap$ * * 'label := } @@ -3376,16 +3329,7 @@ FUNCTION {init.bib.eprint} FUNCTION {init.bib.doi} { - "\@ifxundefined \urlstyle {%" write$ newline$ - " \providecommand " doi.command " [0]{\begingroup \@sanitize@url \@doi}%" * * write$ newline$ - " \providecommand \@doi [1]{\endgroup \@@startlink {\doibase #1}doi:\discretionary {}{}{}#1\@@endlink }%" write$ newline$ - "}{%" write$ newline$ - " \providecommand " doi.command " [0]{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url }%" * * write$ newline$ - "}%" write$ newline$ "\providecommand \doibase [0]{" doi.base "}%" * * write$ newline$ - "\providecommand " doi.command.href "[0]{\begingroup \@sanitize@url \@Doi }%" * * write$ newline$ - "\providecommand \@Doi [1]{\endgroup\@@startlink{\doibase#1}\@@Doi}%" write$ newline$ - "\providecommand \@@Doi [1]{#1\@@endlink}%" write$ newline$ } FUNCTION {init.bib.hypertex} @@ -3475,6 +3419,7 @@ FUNCTION {init.bib} init.bib.translation init.bib.endbibitem "\providecommand " bbl.shut * " [1]{\csname bibitem#1\endcsname}%" * write$ newline$ + "\let\auto@bib@innerbib\@empty" write$ newline$ "%</preamble>" write$ } diff --git a/Master/texmf-dist/bibtex/bst/revtex/apsrmp4-1.bst b/Master/texmf-dist/bibtex/bst/revtex/apsrmp4-1.bst index f9098d4442e..77e253c9bf4 100644 --- a/Master/texmf-dist/bibtex/bst/revtex/apsrmp4-1.bst +++ b/Master/texmf-dist/bibtex/bst/revtex/apsrmp4-1.bst @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,isbn,issn,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,isbn,issn,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,isbn,issn,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,isbn,issn,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') -%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,isbn,issn,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `head,ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% physjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% geojour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% photjour.mbs (with options: `ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') +%% merlin.mbs (with options: `tail,ay,nat,lang,pres,pres-bf,vonx,nm-rev1,jnrlst,nmft,nmft-def,fnm-def,nmfted,nmand-rm,lab,lab-def,and-rm,keyxyr,dt-beg,yr-par,dtrev,date-nil-x,tit-qq,inproceedings-chapter,jtit-x,inproceedings-chapter,article-booktitle,article-series,jttl-rm,journal-address,book-bt,thesis-title-o,trtit-b,techreport-institution-par,vol-bf,vnum-sp,volp-com,jpg-1,pp-last,book-editor-booktitle,inbook-editor-booktitle,bookaddress,num-xser,number-cap,chapter-cap,series-number,numser-booktitle,ser-vol,ser-rm,volume-cap,ser-ed,jnm-x,pg-bk,book-chapter-pages,pub-par,ay-empty-pub-parens-x,pre-edn,school-par,doi-link,doi,bkedcap,edby,blk-com,fin-endbibitem,pp,ed,abr,ednx,ord,jabr,and-com,etal-it,revdata,eprint,url,url-blk,translation,SLACcitation,numpages-x,url,url-prefix-x,bibinfo,bibfield,nfss,,{}') %% ---------------------------------------- -%% *** REVTeX-compatible RMP 2010-02-12 *** +%% *** REVTeX-compatible RMP 2010-07-25 *** %% %% Copyright 1994-2007 Patrick W Daly % =============================================================== @@ -54,7 +54,7 @@ % \citeyear{key} ==>> 1990 %--------------------------------------------------------------------- -FUNCTION {id.bst} {"merlin.mbs 2010-03-15 4.21a (PWD, AO, DPC)"} +FUNCTION {id.bst} {"merlin.mbs apsrmp4-1.bst 2010-07-25 4.21a (PWD, AO, DPC) hacked"} ENTRY { address @@ -1512,6 +1512,7 @@ FUNCTION {format.names.morfont} { bib.fname.font ", " swap$ * } if$ } { + "," * s nameptr format.names.fname "jj" @@ -1779,25 +1780,12 @@ FUNCTION {format.editors} if$ } -FUNCTION {format.isbn} +FUNCTION {format.isbn.output} { - isbn "isbn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISBN " swap$ * - } - if$ } -FUNCTION {format.issn} -{ issn "issn" bibinfo.check - duplicate$ empty$ 'skip$ - { - new.block.comma - "ISSN " swap$ * - } - if$ +FUNCTION {format.issn.output} +{ } FUNCTION {doi.base} @@ -1805,19 +1793,14 @@ FUNCTION {doi.base} "http://dx.doi.org/" } -FUNCTION {noop.command} +FUNCTION {doi.base.command} { - "\href@noop " + "\doibase " } -FUNCTION {doi.command} -{ - "\doi " -} - -FUNCTION {doi.command.href} +FUNCTION {noop.command} { - "\Doi " + "\href@noop " } FUNCTION {href.command} @@ -1825,38 +1808,6 @@ FUNCTION {href.command} "\href " } -FUNCTION {format.doi} -{ doi - duplicate$ empty$ 'skip$ - { - new.block.comma - doi.command "{" * swap$ * "}" * - } - if$ -} - -FUNCTION {add.doi.old} -{ - duplicate$ empty$ 'skip$ - { - doi duplicate$ empty$ - { - pop$ - url duplicate$ empty$ - { - pop$ - }{ - href.command " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - { - doi.command.href " {" * swap$ * "} {" * swap$ * "}" * - } - if$ - } - if$ -} FUNCTION {link.tag.open} { doi duplicate$ empty$ @@ -1871,7 +1822,8 @@ FUNCTION {link.tag.open} if$ } { - doi.command.href + doi.base.command swap$ * + href.command } if$ "{" * swap$ * "} {" * @@ -2056,7 +2008,7 @@ FUNCTION {output.bibitem} newline$ "" label - * + * ")" * make.full.names duplicate$ short.list = { pop$ }{ * } if$ bracify @@ -2653,19 +2605,20 @@ FUNCTION {article} "journal" bibinfo.warn "journal" 'bibfield := output + add.blank format.ser.vol.num output eid.or.pages + pages empty$ { + doi output + } 'skip$ if$ link.shut }{ format.article.crossref output.nonnull eid.or.pages } if$ - format.issn output - pages empty$ { - format.doi output - } 'skip$ if$ + format.issn.output new.block.comma new.sentence.comma format.note output @@ -2710,7 +2663,7 @@ FUNCTION {book} format.book.crossref output.nonnull } if$ - format.isbn output + format.isbn.output format.chapter.pages output new.block.comma @@ -2732,7 +2685,7 @@ FUNCTION {booklet} new.block.comma howpublished "howpublished" bibinfo.check output address "address" bibinfo.check output - format.isbn output + format.isbn.output format.book.pages output new.block.comma new.sentence.comma @@ -2782,7 +2735,7 @@ FUNCTION {inbook} } if$ crossref missing$ - { format.isbn output } + { format.isbn.output } 'skip$ if$ format.pages "pages" output.check @@ -2805,7 +2758,7 @@ FUNCTION {incollection} format.edition output format.chapter.pages output format.publisher.address output - format.isbn output + format.isbn.output }{ format.incoll.inproc.crossref output.nonnull format.chapter.pages output @@ -2829,8 +2782,8 @@ FUNCTION {inproceedings} { format.in.ed.booktitle format.organization.publisher.address output - format.isbn output - format.issn output + format.isbn.output + format.issn.output }{ format.incoll.inproc.crossref output.nonnull } @@ -2961,8 +2914,8 @@ FUNCTION {proceedings} format.number.series output format.bvolume output format.organization.publisher.address output - format.isbn output - format.issn output + format.isbn.output + format.issn.output new.block.comma new.sentence.comma format.note output @@ -3133,7 +3086,7 @@ FUNCTION {calc.label} control.year #0 > { purify$ #-1 #4 substring$ } 'skip$ if$ } if$ - "(" swap$ * ")" * + "(" swap$ * * 'label := } @@ -3367,16 +3320,7 @@ FUNCTION {init.bib.eprint} FUNCTION {init.bib.doi} { - "\@ifxundefined \urlstyle {%" write$ newline$ - " \providecommand " doi.command " [0]{\begingroup \@sanitize@url \@doi}%" * * write$ newline$ - " \providecommand \@doi [1]{\endgroup \@@startlink {\doibase #1}doi:\discretionary {}{}{}#1\@@endlink }%" write$ newline$ - "}{%" write$ newline$ - " \providecommand " doi.command " [0]{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url }%" * * write$ newline$ - "}%" write$ newline$ "\providecommand \doibase [0]{" doi.base "}%" * * write$ newline$ - "\providecommand " doi.command.href "[0]{\begingroup \@sanitize@url \@Doi }%" * * write$ newline$ - "\providecommand \@Doi [1]{\endgroup\@@startlink{\doibase#1}\@@Doi}%" write$ newline$ - "\providecommand \@@Doi [1]{#1\@@endlink}%" write$ newline$ } FUNCTION {init.bib.hypertex} @@ -3466,6 +3410,7 @@ FUNCTION {init.bib} init.bib.translation init.bib.endbibitem "\providecommand " bbl.shut * " [1]{\csname bibitem#1\endcsname}%" * write$ newline$ + "\let\auto@bib@innerbib\@empty" write$ newline$ "%</preamble>" write$ } |