summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-01-03 01:19:34 +0000
committerKarl Berry <karl@freefriends.org>2007-01-03 01:19:34 +0000
commitae9b91f93a72faaf468c54d28dc3e09fccd562d9 (patch)
treedd55433fb4cb72bfc56bfdaff7a67646da44349b /Master/texmf-dist/bibtex
parentb2d661dce32486b0e6e8e45af0073c42bd196038 (diff)
rsc update (1jan07)
git-svn-id: svn://tug.org/texlive/trunk@3106 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/angew-mc.bst1044
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/angew.bst1042
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/rsc-mc.bst295
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/rsc.bst295
4 files changed, 2346 insertions, 330 deletions
diff --git a/Master/texmf-dist/bibtex/bst/rsc/angew-mc.bst b/Master/texmf-dist/bibtex/bst/rsc/angew-mc.bst
new file mode 100644
index 00000000000..dd9ba9be909
--- /dev/null
+++ b/Master/texmf-dist/bibtex/bst/rsc/angew-mc.bst
@@ -0,0 +1,1044 @@
+%%
+%% This is file `angew-mc.bst',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% rsc.dtx (with options: `bib,angew,mc')
+%% ----------------------------------------------------------------
+%% The rsc package - BibTeX and macro support for Royal Society
+%% of Chemistry and Wiley chemistry articles
+%% Maintained by Joseph A. Wright
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the GNU General Public License
+%% See http://www.gnu.org/licenses/gpl.txt
+%% ----------------------------------------------------------------
+ENTRY
+ { address
+ author
+ booktitle
+ chapter
+ doi
+ edition
+ editor
+ howpublished
+ institution
+ journal
+ note
+ number
+ organization
+ pages
+ publisher
+ school
+ series
+ title
+ type
+ volume
+ year
+ }
+ {}
+ { label }
+
+INTEGERS { output.state before.all mid.sentence after.sentence }
+INTEGERS { after.block after.item author.or.editor }
+
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+ #1 'mid.sentence :=
+ #2 'after.sentence :=
+ #3 'after.block :=
+ #4 'after.item :=
+}
+
+FUNCTION {add.comma}
+{ ", " * }
+
+STRINGS { s t }
+
+FUNCTION {output.nonnull}
+{ 's :=
+ output.state mid.sentence =
+ { add.comma write$ }
+ { output.state after.block =
+ { add.comma write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { output.state after.item =
+ { " " * write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
+ if$
+ }
+ if$
+ mid.sentence 'output.state :=
+ }
+ if$
+ s
+}
+
+FUNCTION {output}
+{ duplicate$ empty$
+ 'pop$
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.check}
+{ 't :=
+ duplicate$ empty$
+ { pop$ "Empty " t * " in " * cite$ * warning$ }
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.bibitem}
+{ newline$
+ "\bibitem{" write$
+ cite$ write$
+ "}" write$
+ newline$
+ ""
+ before.all 'output.state :=
+}
+
+FUNCTION {fin.entry}
+{ write$
+ "\relax" write$
+ newline$
+ "\relax" write$
+}
+
+FUNCTION {not}
+{ { #0 }
+ { #1 }
+ if$
+}
+
+FUNCTION {and}
+{ 'skip$
+ { pop$ #0 }
+ if$
+}
+
+FUNCTION {or}
+{ { pop$ #1 }
+ 'skip$
+ if$
+}
+
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+}
+
+FUNCTION {emphasize}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "\emph{" swap$ * "}" * }
+ if$
+}
+
+FUNCTION {boldface}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "\textbf{" swap$ * "}" * }
+ if$
+}
+
+FUNCTION {paren}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "(" swap$ * ")" * }
+ if$
+}
+
+FUNCTION {bbl.and}
+{ "and" }
+
+FUNCTION {bbl.chapter}
+{ "Chapter" }
+
+FUNCTION {bbl.editor}
+{ "Ed.:" }
+
+FUNCTION {bbl.editors}
+{ "Eds.:" }
+
+FUNCTION {bbl.edition}
+{ "ed." }
+
+FUNCTION {bbl.etal}
+{ "et~al." emphasize }
+
+FUNCTION {bbl.in}
+{ "in" }
+
+FUNCTION {bbl.inpress}
+{ "in press" }
+
+FUNCTION {bbl.msc}
+{ "MSc thesis" }
+
+FUNCTION {bbl.page}
+{ "p." }
+
+FUNCTION {bbl.pages}
+{ "pp." }
+
+FUNCTION {bbl.phd}
+{ "PhD thesis" }
+
+FUNCTION {bbl.submitted}
+{ "submitted for publication" }
+
+FUNCTION {bbl.techreport}
+{ "Technical Report" }
+
+FUNCTION {bbl.volume}
+{ "Vol." }
+
+FUNCTION {bbl.first}
+{ "1st" }
+
+FUNCTION {bbl.second}
+{ "2nd" }
+
+FUNCTION {bbl.third}
+{ "3rd" }
+
+FUNCTION {bbl.fourth}
+{ "4th" }
+
+FUNCTION {bbl.fifth}
+{ "5th" }
+
+FUNCTION {bbl.st}
+{ "st" }
+
+FUNCTION {bbl.nd}
+{ "nd" }
+
+FUNCTION {bbl.rd}
+{ "rd" }
+
+FUNCTION {bbl.th}
+{ "th" }
+
+FUNCTION {eng.ord}
+{ duplicate$ "1" swap$ *
+ #-2 #1 substring$ "1" =
+ { bbl.th * }
+ { duplicate$ #-1 #1 substring$
+ duplicate$ "1" =
+ { pop$ bbl.st * }
+ { duplicate$ "2" =
+ { pop$ bbl.nd * }
+ { "3" =
+ { bbl.rd * }
+ { bbl.th * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+INTEGERS{ l }
+
+FUNCTION{string.length}
+{ #1 'l :=
+ { duplicate$ duplicate$ #1 l substring$ = not }
+ { l #1 + 'l := }
+ while$
+ pop$ l
+}
+
+STRINGS{replace find text}
+
+INTEGERS{find_length}
+
+FUNCTION{find.replace}
+{ 'replace :=
+ 'find :=
+ 'text :=
+ find string.length 'find_length :=
+ ""
+ { text empty$ not }
+ { text #1 find_length substring$ find =
+ { replace *
+ text #1 find_length + global.max$ substring$ 'text :=
+ }
+ { text #1 #1 substring$ *
+ text #2 global.max$ substring$ 'text :=
+ }
+ if$
+ }
+ while$
+}
+
+FUNCTION{is.a.digit}
+{ duplicate$ "" =
+ {pop$ #0}
+ {chr.to.int$ #48 - duplicate$
+ #0 < swap$ #9 > or not}
+ if$
+}
+
+FUNCTION{is.a.number}
+{
+ { duplicate$ #1 #1 substring$ is.a.digit }
+ {#2 global.max$ substring$}
+ while$
+ "" =
+}
+
+FUNCTION {extract.num}
+{ duplicate$ 't :=
+ "" 's :=
+ { t empty$ not }
+ { t #1 #1 substring$
+ t #2 global.max$ substring$ 't :=
+ duplicate$ is.a.number
+ { s swap$ * 's := }
+ { pop$ "" 't := }
+ if$
+ }
+ while$
+ s empty$
+ 'skip$
+ { pop$ s }
+ if$
+}
+
+FUNCTION {bibinfo.check}
+{ swap$
+ duplicate$ missing$
+ { pop$ pop$
+ ""
+ }
+ { duplicate$ empty$
+ {
+ swap$ pop$
+ }
+ { swap$
+ pop$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {convert.edition}
+{ extract.num "l" change.case$ 's :=
+ s "first" = s "1" = or
+ { bbl.first 't := }
+ { s "second" = s "2" = or
+ { bbl.second 't := }
+ { s "third" = s "3" = or
+ { bbl.third 't := }
+ { s "fourth" = s "4" = or
+ { bbl.fourth 't := }
+ { s "fifth" = s "5" = or
+ { bbl.fifth 't := }
+ { s #1 #1 substring$ is.a.number
+ { s eng.ord 't := }
+ { edition 't := }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ t
+}
+
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+ { "~" }
+ { " " }
+ if$
+ swap$ * *
+}
+
+FUNCTION {space.connect}
+{ " " swap$ * * }
+
+INTEGERS { nameptr namesleft numnames }
+
+FUNCTION {format.names}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+ nameptr #1 >
+ { namesleft #1 >
+ { add.comma t * }
+ { numnames #2 >
+ { "" * }
+ 'skip$
+ if$
+ t "others" =
+ { bbl.etal space.connect }
+ { add.comma t * }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {format.authors}
+{ author empty$
+ { "" }
+ { #1 'author.or.editor :=
+ author format.names }
+ if$
+}
+
+FUNCTION {strip.comma}
+{ duplicate$
+ string.length 'find_length :=
+ duplicate$
+ find_length #1 - #1 substring$
+ "," =
+ { #1 find_length #2 - substring$
+ " " *
+ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.editors}
+{ editor empty$
+ { "" }
+ { #2 'author.or.editor :=
+ strip.comma
+ editor num.names$ #1 >
+ { bbl.editors }
+ { bbl.editor }
+ if$
+ " " *
+ editor format.names * paren
+ }
+ if$
+}
+
+FUNCTION {n.separate.multi}
+{ 't :=
+ ""
+ #0 'numnames :=
+ t text.length$ #4 > t is.a.number and
+ {
+ { t empty$ not }
+ { t #-1 #1 substring$ is.a.number
+ { numnames #1 + 'numnames := }
+ { #0 'numnames := }
+ if$
+ t #-1 #1 substring$ swap$ *
+ t #-2 global.max$ substring$ 't :=
+ numnames #4 =
+ { duplicate$ #1 #1 substring$ swap$
+ #2 global.max$ substring$
+ "\," swap$ * *
+ #1 'numnames :=
+ }
+ 'skip$
+ if$
+ }
+ while$
+ }
+ { t swap$ * }
+ if$
+}
+
+FUNCTION {format.bvolume}
+{ volume empty$
+ { "" }
+ { bbl.volume volume tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.title.noemph}
+{ 't :=
+ t empty$
+ { "" }
+ { t }
+ if$
+}
+
+FUNCTION {format.title}
+{ 't :=
+ t empty$
+ { "" }
+ { t emphasize }
+ if$
+}
+
+FUNCTION {format.title.vol}
+{ 't :=
+ t empty$
+ { "" }
+ { t emphasize }
+ if$
+ volume empty$
+ 'skip$
+ { format.bvolume emphasize
+ swap$ add.comma swap$ *
+ }
+ if$
+ }
+
+FUNCTION {n.dashify} { 't :=
+ ""
+ { t empty$ not }
+ { t #1 #1 substring$ "-" =
+ { t #1 #2 substring$ "--" = not
+ { "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ { { t #1 #1 substring$ "-" = }
+ { "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ { t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
+ if$
+ }
+ while$
+}
+
+FUNCTION {format.date}
+{ year empty$
+ { "" }
+ { year boldface }
+ if$
+}
+
+FUNCTION {format.bdate}
+{ year empty$
+ { "There's no year in " cite$ * warning$ }
+ { year boldface }
+ if$
+}
+
+FUNCTION {either.or.check}
+{ empty$
+ 'pop$
+ { "Can't use both " swap$ * " fields in " * cite$ * warning$ }
+ if$
+}
+
+FUNCTION {format.edition}
+{ edition duplicate$ empty$
+ 'skip$
+ { convert.edition
+ bbl.edition bibinfo.check
+ " " * bbl.edition *
+ }
+ if$
+}
+
+INTEGERS { multiresult }
+
+FUNCTION {multi.page.check}
+{ 't :=
+ #0 'multiresult :=
+ { multiresult not
+ t empty$ not
+ and
+ }
+ { t #1 #1 substring$
+ duplicate$ "-" =
+ swap$ duplicate$ "," =
+ swap$ "+" =
+ or or
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
+ if$
+ }
+ while$
+ multiresult
+}
+
+FUNCTION {format.pages}
+{ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.pages pages n.dashify tie.or.space.connect }
+ { bbl.page pages tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+
+FUNCTION {format.pages.required}
+{ pages empty$
+ { ""
+ "There are no page numbers for " cite$ * warning$
+ output
+ }
+ { pages multi.page.check
+ { bbl.pages pages n.dashify tie.or.space.connect }
+ { bbl.page pages tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.pages.nopp}
+{ pages empty$
+ { ""
+ "There are no page numbers for " cite$ * warning$
+ output
+ }
+ { pages multi.page.check
+ { pages n.dashify space.connect }
+ { pages space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.pages.patent}
+{ pages empty$
+ { "There is no patent number for " cite$ * warning$ }
+ { pages multi.page.check
+ { pages n.dashify }
+ { pages }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.vol.pages}
+{ volume emphasize field.or.null
+ duplicate$ empty$
+ { pop$ format.pages.required }
+ { add.comma pages n.dashify * }
+ if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+ 'format.pages
+ { type empty$
+ { bbl.chapter }
+ { type "l" change.case$ }
+ if$
+ chapter tie.or.space.connect
+ pages empty$
+ 'skip$
+ { add.comma format.pages * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.title.in}
+{ 's :=
+ after.item 'output.state :=
+ s empty$
+ { "" }
+ { editor empty$
+ { bbl.in s format.title space.connect }
+ { bbl.in s format.title space.connect
+ add.comma format.editors *
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.title.vol.in}
+{ 's :=
+ after.item 'output.state :=
+ s empty$
+ { "" }
+ { editor empty$
+ { bbl.in s format.title.vol space.connect }
+ { bbl.in s format.title.vol space.connect
+ add.comma format.editors *
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.pub.address}
+{ publisher empty$
+ { "" }
+ { address empty$
+ { publisher }
+ { publisher add.comma address *}
+ if$
+ }
+ if$
+}
+
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+ year empty$ note empty$
+ and and and and
+ { "all relevant fields are empty in " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {empty.doi.note}
+{ doi empty$ note empty$ and
+ { "Need either a note or DOI for " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.thesis.type}
+{ type empty$
+ 'skip$
+ { pop$
+ type emphasize
+ }
+ if$
+}
+
+FUNCTION {article}
+{ output.bibitem
+ format.authors "author" output.check
+ journal "," "" find.replace emphasize
+ "journal" output.check
+ after.item 'output.state :=
+ format.date "year" output.check
+ volume empty$
+ { ""
+ format.pages.nopp output
+ }
+ { format.vol.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {book}
+{ output.bibitem
+ author empty$
+ { title format.title.vol "title" output.check
+ editor empty$
+ { "Need either an author or editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
+ }
+ { format.authors output
+ "author and editor" editor either.or.check
+ title format.title.vol "title" output.check
+ }
+ if$
+ format.pub.address "publisher" output.check
+ format.edition output
+ format.bdate "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {booklet}
+{ output.bibitem
+ format.authors output
+ title format.title "title" output.check
+ howpublished output
+ address output
+ format.date output
+ fin.entry
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+ author empty$
+ { title format.title.vol "title" output.check
+ editor empty$
+ { "Need at least an author or an editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
+ }
+ { format.authors output
+ title format.title.vol.in "title" output.check
+ }
+ if$
+ format.pub.address "publisher" output.check
+ format.edition output
+ format.bdate "year" output.check
+ format.chapter.pages "chapter and pages" output.check
+ fin.entry
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+ author empty$
+ { booktitle format.title.vol "booktitle" output.check
+ editor empty$
+ { "Need at least an author or an editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
+ }
+ { format.authors output
+ booktitle format.title.vol.in "booktitle" output.check
+ }
+ if$
+ format.pub.address "publisher" output.check
+ format.edition output
+ format.bdate "year" output.check
+ format.chapter.pages "chapter and pages" output.check
+ fin.entry
+}
+
+FUNCTION {inpress}
+{ output.bibitem
+ format.authors "author" output.check
+ journal emphasize "journal" output.check
+ bbl.inpress output
+ fin.entry
+}
+
+FUNCTION {inproceedings}
+{ output.bibitem
+ format.authors "author" output.check
+ booktitle format.title "booktitle" output.check
+ address output
+ format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {manual}
+{ output.bibitem
+ author empty$
+ { organization empty$
+ 'skip$
+ { organization output
+ address output
+ }
+ if$
+ }
+ { format.authors output }
+ if$
+ title format.title.noemph "title" output.check
+ author empty$
+ { organization empty$
+ { address output }
+ 'skip$
+ if$
+ }
+ { organization output
+ address output
+ }
+ if$
+ format.edition output
+ format.date output
+ fin.entry
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ bbl.msc format.thesis.type output
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {misc}
+{ output.bibitem
+ format.authors output
+ title format.title output
+ howpublished output
+ format.date output
+ note output
+ fin.entry
+ empty.misc.check
+}
+
+FUNCTION {patent}
+{ output.bibitem
+ organization empty$
+ { format.authors "author and organization" output.check }
+ { author empty$
+ { organization }
+ { format.authors organization paren space.connect }
+ if$
+ "author and organization" output.check
+ }
+ if$
+ journal emphasize "journal" output.check
+ format.pages.patent "pages" output.check
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {phdthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ bbl.phd format.thesis.type output
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+ title format.title "title" output.check
+ address output
+ format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {remark}
+{ output.bibitem
+ note "note" output.check
+ fin.entry
+}
+
+FUNCTION {submitted}
+{ output.bibitem
+ format.authors "author" output.check
+ bbl.submitted output
+ fin.entry
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+ format.authors "author" output.check
+ title format.title "title" output.check
+ institution
+ type empty$
+ 'bbl.techreport
+ 'type
+ if$
+ space.connect
+ number empty$
+ { "t" change.case$ }
+ { number tie.or.space.connect }
+ if$
+ output
+ format.pub.address output
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+ format.authors "author" output.check
+ journal empty$
+ 'skip$
+ { journal emphasize "journal" output.check }
+ if$
+ doi empty$
+ { note output }
+ { "DOI" doi tie.or.space.connect output }
+ if$
+ fin.entry
+ empty.doi.note
+}
+
+FUNCTION {conference} {inproceedings}
+
+FUNCTION {other} {patent}
+
+FUNCTION {default.type} {misc}
+
+MACRO {jan} {"January"}
+MACRO {feb} {"February"}
+MACRO {mar} {"March"}
+MACRO {apr} {"April"}
+MACRO {may} {"May"}
+MACRO {jun} {"June"}
+MACRO {jul} {"July"}
+MACRO {aug} {"August"}
+MACRO {sep} {"September"}
+MACRO {oct} {"October"}
+MACRO {nov} {"November"}
+MACRO {dec} {"December"}
+
+READ
+
+STRINGS { longest.label }
+
+INTEGERS { number.label longest.label.width }
+
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+ #1 'number.label :=
+ #0 'longest.label.width :=
+}
+
+FUNCTION {longest.label.pass}
+{ number.label int.to.str$ 'label :=
+ number.label #1 + 'number.label :=
+ label width$ longest.label.width >
+ { label 'longest.label :=
+ label width$ 'longest.label.width :=
+ }
+ 'skip$
+ if$
+}
+
+EXECUTE {initialize.longest.label}
+
+ITERATE {longest.label.pass}
+
+FUNCTION {begin.bib}
+{ preamble$ empty$
+ 'skip$
+ { preamble$ write$ newline$ }
+ if$
+ "\begin{mcbibliography}{" longest.label * "}" * write$ newline$
+}
+
+EXECUTE {begin.bib}
+
+EXECUTE {init.state.consts}
+
+ITERATE {call.type$}
+
+FUNCTION {end.bib}
+{ newline$
+ "\end{mcbibliography}" write$ newline$
+}
+
+EXECUTE {end.bib}
+%%
+%%
+%% End of file `angew-mc.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/rsc/angew.bst b/Master/texmf-dist/bibtex/bst/rsc/angew.bst
new file mode 100644
index 00000000000..e27e111e04b
--- /dev/null
+++ b/Master/texmf-dist/bibtex/bst/rsc/angew.bst
@@ -0,0 +1,1042 @@
+%%
+%% This is file `angew.bst',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% rsc.dtx (with options: `bib,angew')
+%% ----------------------------------------------------------------
+%% The rsc package - BibTeX and macro support for Royal Society
+%% of Chemistry and Wiley chemistry articles
+%% Maintained by Joseph A. Wright
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the GNU General Public License
+%% See http://www.gnu.org/licenses/gpl.txt
+%% ----------------------------------------------------------------
+ENTRY
+ { address
+ author
+ booktitle
+ chapter
+ doi
+ edition
+ editor
+ howpublished
+ institution
+ journal
+ note
+ number
+ organization
+ pages
+ publisher
+ school
+ series
+ title
+ type
+ volume
+ year
+ }
+ {}
+ { label }
+
+INTEGERS { output.state before.all mid.sentence after.sentence }
+INTEGERS { after.block after.item author.or.editor }
+
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+ #1 'mid.sentence :=
+ #2 'after.sentence :=
+ #3 'after.block :=
+ #4 'after.item :=
+}
+
+FUNCTION {add.comma}
+{ ", " * }
+
+STRINGS { s t }
+
+FUNCTION {output.nonnull}
+{ 's :=
+ output.state mid.sentence =
+ { add.comma write$ }
+ { output.state after.block =
+ { add.comma write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { output.state after.item =
+ { " " * write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
+ if$
+ }
+ if$
+ mid.sentence 'output.state :=
+ }
+ if$
+ s
+}
+
+FUNCTION {output}
+{ duplicate$ empty$
+ 'pop$
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.check}
+{ 't :=
+ duplicate$ empty$
+ { pop$ "Empty " t * " in " * cite$ * warning$ }
+ 'output.nonnull
+ if$
+}
+
+FUNCTION {output.bibitem}
+{ newline$
+ "\bibitem{" write$
+ cite$ write$
+ "}" write$
+ newline$
+ ""
+ before.all 'output.state :=
+}
+
+FUNCTION {fin.entry}
+{ add.period$
+ write$
+ newline$
+}
+FUNCTION {not}
+{ { #0 }
+ { #1 }
+ if$
+}
+
+FUNCTION {and}
+{ 'skip$
+ { pop$ #0 }
+ if$
+}
+
+FUNCTION {or}
+{ { pop$ #1 }
+ 'skip$
+ if$
+}
+
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+}
+
+FUNCTION {emphasize}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "\emph{" swap$ * "}" * }
+ if$
+}
+
+FUNCTION {boldface}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "\textbf{" swap$ * "}" * }
+ if$
+}
+
+FUNCTION {paren}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "(" swap$ * ")" * }
+ if$
+}
+
+FUNCTION {bbl.and}
+{ "and" }
+
+FUNCTION {bbl.chapter}
+{ "Chapter" }
+
+FUNCTION {bbl.editor}
+{ "Ed.:" }
+
+FUNCTION {bbl.editors}
+{ "Eds.:" }
+
+FUNCTION {bbl.edition}
+{ "ed." }
+
+FUNCTION {bbl.etal}
+{ "et~al." emphasize }
+
+FUNCTION {bbl.in}
+{ "in" }
+
+FUNCTION {bbl.inpress}
+{ "in press" }
+
+FUNCTION {bbl.msc}
+{ "MSc thesis" }
+
+FUNCTION {bbl.page}
+{ "p." }
+
+FUNCTION {bbl.pages}
+{ "pp." }
+
+FUNCTION {bbl.phd}
+{ "PhD thesis" }
+
+FUNCTION {bbl.submitted}
+{ "submitted for publication" }
+
+FUNCTION {bbl.techreport}
+{ "Technical Report" }
+
+FUNCTION {bbl.volume}
+{ "Vol." }
+
+FUNCTION {bbl.first}
+{ "1st" }
+
+FUNCTION {bbl.second}
+{ "2nd" }
+
+FUNCTION {bbl.third}
+{ "3rd" }
+
+FUNCTION {bbl.fourth}
+{ "4th" }
+
+FUNCTION {bbl.fifth}
+{ "5th" }
+
+FUNCTION {bbl.st}
+{ "st" }
+
+FUNCTION {bbl.nd}
+{ "nd" }
+
+FUNCTION {bbl.rd}
+{ "rd" }
+
+FUNCTION {bbl.th}
+{ "th" }
+
+FUNCTION {eng.ord}
+{ duplicate$ "1" swap$ *
+ #-2 #1 substring$ "1" =
+ { bbl.th * }
+ { duplicate$ #-1 #1 substring$
+ duplicate$ "1" =
+ { pop$ bbl.st * }
+ { duplicate$ "2" =
+ { pop$ bbl.nd * }
+ { "3" =
+ { bbl.rd * }
+ { bbl.th * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+INTEGERS{ l }
+
+FUNCTION{string.length}
+{ #1 'l :=
+ { duplicate$ duplicate$ #1 l substring$ = not }
+ { l #1 + 'l := }
+ while$
+ pop$ l
+}
+
+STRINGS{replace find text}
+
+INTEGERS{find_length}
+
+FUNCTION{find.replace}
+{ 'replace :=
+ 'find :=
+ 'text :=
+ find string.length 'find_length :=
+ ""
+ { text empty$ not }
+ { text #1 find_length substring$ find =
+ { replace *
+ text #1 find_length + global.max$ substring$ 'text :=
+ }
+ { text #1 #1 substring$ *
+ text #2 global.max$ substring$ 'text :=
+ }
+ if$
+ }
+ while$
+}
+
+FUNCTION{is.a.digit}
+{ duplicate$ "" =
+ {pop$ #0}
+ {chr.to.int$ #48 - duplicate$
+ #0 < swap$ #9 > or not}
+ if$
+}
+
+FUNCTION{is.a.number}
+{
+ { duplicate$ #1 #1 substring$ is.a.digit }
+ {#2 global.max$ substring$}
+ while$
+ "" =
+}
+
+FUNCTION {extract.num}
+{ duplicate$ 't :=
+ "" 's :=
+ { t empty$ not }
+ { t #1 #1 substring$
+ t #2 global.max$ substring$ 't :=
+ duplicate$ is.a.number
+ { s swap$ * 's := }
+ { pop$ "" 't := }
+ if$
+ }
+ while$
+ s empty$
+ 'skip$
+ { pop$ s }
+ if$
+}
+
+FUNCTION {bibinfo.check}
+{ swap$
+ duplicate$ missing$
+ { pop$ pop$
+ ""
+ }
+ { duplicate$ empty$
+ {
+ swap$ pop$
+ }
+ { swap$
+ pop$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {convert.edition}
+{ extract.num "l" change.case$ 's :=
+ s "first" = s "1" = or
+ { bbl.first 't := }
+ { s "second" = s "2" = or
+ { bbl.second 't := }
+ { s "third" = s "3" = or
+ { bbl.third 't := }
+ { s "fourth" = s "4" = or
+ { bbl.fourth 't := }
+ { s "fifth" = s "5" = or
+ { bbl.fifth 't := }
+ { s #1 #1 substring$ is.a.number
+ { s eng.ord 't := }
+ { edition 't := }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ t
+}
+
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+ { "~" }
+ { " " }
+ if$
+ swap$ * *
+}
+
+FUNCTION {space.connect}
+{ " " swap$ * * }
+
+INTEGERS { nameptr namesleft numnames }
+
+FUNCTION {format.names}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+ nameptr #1 >
+ { namesleft #1 >
+ { add.comma t * }
+ { numnames #2 >
+ { "" * }
+ 'skip$
+ if$
+ t "others" =
+ { bbl.etal space.connect }
+ { add.comma t * }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {format.authors}
+{ author empty$
+ { "" }
+ { #1 'author.or.editor :=
+ author format.names }
+ if$
+}
+
+FUNCTION {strip.comma}
+{ duplicate$
+ string.length 'find_length :=
+ duplicate$
+ find_length #1 - #1 substring$
+ "," =
+ { #1 find_length #2 - substring$
+ " " *
+ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.editors}
+{ editor empty$
+ { "" }
+ { #2 'author.or.editor :=
+ strip.comma
+ editor num.names$ #1 >
+ { bbl.editors }
+ { bbl.editor }
+ if$
+ " " *
+ editor format.names * paren
+ }
+ if$
+}
+
+FUNCTION {n.separate.multi}
+{ 't :=
+ ""
+ #0 'numnames :=
+ t text.length$ #4 > t is.a.number and
+ {
+ { t empty$ not }
+ { t #-1 #1 substring$ is.a.number
+ { numnames #1 + 'numnames := }
+ { #0 'numnames := }
+ if$
+ t #-1 #1 substring$ swap$ *
+ t #-2 global.max$ substring$ 't :=
+ numnames #4 =
+ { duplicate$ #1 #1 substring$ swap$
+ #2 global.max$ substring$
+ "\," swap$ * *
+ #1 'numnames :=
+ }
+ 'skip$
+ if$
+ }
+ while$
+ }
+ { t swap$ * }
+ if$
+}
+
+FUNCTION {format.bvolume}
+{ volume empty$
+ { "" }
+ { bbl.volume volume tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.title.noemph}
+{ 't :=
+ t empty$
+ { "" }
+ { t }
+ if$
+}
+
+FUNCTION {format.title}
+{ 't :=
+ t empty$
+ { "" }
+ { t emphasize }
+ if$
+}
+
+FUNCTION {format.title.vol}
+{ 't :=
+ t empty$
+ { "" }
+ { t emphasize }
+ if$
+ volume empty$
+ 'skip$
+ { format.bvolume emphasize
+ swap$ add.comma swap$ *
+ }
+ if$
+ }
+
+FUNCTION {n.dashify} { 't :=
+ ""
+ { t empty$ not }
+ { t #1 #1 substring$ "-" =
+ { t #1 #2 substring$ "--" = not
+ { "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ { { t #1 #1 substring$ "-" = }
+ { "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ { t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
+ if$
+ }
+ while$
+}
+
+FUNCTION {format.date}
+{ year empty$
+ { "" }
+ { year boldface }
+ if$
+}
+
+FUNCTION {format.bdate}
+{ year empty$
+ { "There's no year in " cite$ * warning$ }
+ { year boldface }
+ if$
+}
+
+FUNCTION {either.or.check}
+{ empty$
+ 'pop$
+ { "Can't use both " swap$ * " fields in " * cite$ * warning$ }
+ if$
+}
+
+FUNCTION {format.edition}
+{ edition duplicate$ empty$
+ 'skip$
+ { convert.edition
+ bbl.edition bibinfo.check
+ " " * bbl.edition *
+ }
+ if$
+}
+
+INTEGERS { multiresult }
+
+FUNCTION {multi.page.check}
+{ 't :=
+ #0 'multiresult :=
+ { multiresult not
+ t empty$ not
+ and
+ }
+ { t #1 #1 substring$
+ duplicate$ "-" =
+ swap$ duplicate$ "," =
+ swap$ "+" =
+ or or
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
+ if$
+ }
+ while$
+ multiresult
+}
+
+FUNCTION {format.pages}
+{ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.pages pages n.dashify tie.or.space.connect }
+ { bbl.page pages tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+
+FUNCTION {format.pages.required}
+{ pages empty$
+ { ""
+ "There are no page numbers for " cite$ * warning$
+ output
+ }
+ { pages multi.page.check
+ { bbl.pages pages n.dashify tie.or.space.connect }
+ { bbl.page pages tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.pages.nopp}
+{ pages empty$
+ { ""
+ "There are no page numbers for " cite$ * warning$
+ output
+ }
+ { pages multi.page.check
+ { pages n.dashify space.connect }
+ { pages space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.pages.patent}
+{ pages empty$
+ { "There is no patent number for " cite$ * warning$ }
+ { pages multi.page.check
+ { pages n.dashify }
+ { pages }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.vol.pages}
+{ volume emphasize field.or.null
+ duplicate$ empty$
+ { pop$ format.pages.required }
+ { add.comma pages n.dashify * }
+ if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+ 'format.pages
+ { type empty$
+ { bbl.chapter }
+ { type "l" change.case$ }
+ if$
+ chapter tie.or.space.connect
+ pages empty$
+ 'skip$
+ { add.comma format.pages * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.title.in}
+{ 's :=
+ after.item 'output.state :=
+ s empty$
+ { "" }
+ { editor empty$
+ { bbl.in s format.title space.connect }
+ { bbl.in s format.title space.connect
+ add.comma format.editors *
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.title.vol.in}
+{ 's :=
+ after.item 'output.state :=
+ s empty$
+ { "" }
+ { editor empty$
+ { bbl.in s format.title.vol space.connect }
+ { bbl.in s format.title.vol space.connect
+ add.comma format.editors *
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.pub.address}
+{ publisher empty$
+ { "" }
+ { address empty$
+ { publisher }
+ { publisher add.comma address *}
+ if$
+ }
+ if$
+}
+
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+ year empty$ note empty$
+ and and and and
+ { "all relevant fields are empty in " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {empty.doi.note}
+{ doi empty$ note empty$ and
+ { "Need either a note or DOI for " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.thesis.type}
+{ type empty$
+ 'skip$
+ { pop$
+ type emphasize
+ }
+ if$
+}
+
+FUNCTION {article}
+{ output.bibitem
+ format.authors "author" output.check
+ journal "," "" find.replace emphasize
+ "journal" output.check
+ after.item 'output.state :=
+ format.date "year" output.check
+ volume empty$
+ { ""
+ format.pages.nopp output
+ }
+ { format.vol.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {book}
+{ output.bibitem
+ author empty$
+ { title format.title.vol "title" output.check
+ editor empty$
+ { "Need either an author or editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
+ }
+ { format.authors output
+ "author and editor" editor either.or.check
+ title format.title.vol "title" output.check
+ }
+ if$
+ format.pub.address "publisher" output.check
+ format.edition output
+ format.bdate "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {booklet}
+{ output.bibitem
+ format.authors output
+ title format.title "title" output.check
+ howpublished output
+ address output
+ format.date output
+ fin.entry
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+ author empty$
+ { title format.title.vol "title" output.check
+ editor empty$
+ { "Need at least an author or an editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
+ }
+ { format.authors output
+ title format.title.vol.in "title" output.check
+ }
+ if$
+ format.pub.address "publisher" output.check
+ format.edition output
+ format.bdate "year" output.check
+ format.chapter.pages "chapter and pages" output.check
+ fin.entry
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+ author empty$
+ { booktitle format.title.vol "booktitle" output.check
+ editor empty$
+ { "Need at least an author or an editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
+ }
+ { format.authors output
+ booktitle format.title.vol.in "booktitle" output.check
+ }
+ if$
+ format.pub.address "publisher" output.check
+ format.edition output
+ format.bdate "year" output.check
+ format.chapter.pages "chapter and pages" output.check
+ fin.entry
+}
+
+FUNCTION {inpress}
+{ output.bibitem
+ format.authors "author" output.check
+ journal emphasize "journal" output.check
+ bbl.inpress output
+ fin.entry
+}
+
+FUNCTION {inproceedings}
+{ output.bibitem
+ format.authors "author" output.check
+ booktitle format.title "booktitle" output.check
+ address output
+ format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {manual}
+{ output.bibitem
+ author empty$
+ { organization empty$
+ 'skip$
+ { organization output
+ address output
+ }
+ if$
+ }
+ { format.authors output }
+ if$
+ title format.title.noemph "title" output.check
+ author empty$
+ { organization empty$
+ { address output }
+ 'skip$
+ if$
+ }
+ { organization output
+ address output
+ }
+ if$
+ format.edition output
+ format.date output
+ fin.entry
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ bbl.msc format.thesis.type output
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {misc}
+{ output.bibitem
+ format.authors output
+ title format.title output
+ howpublished output
+ format.date output
+ note output
+ fin.entry
+ empty.misc.check
+}
+
+FUNCTION {patent}
+{ output.bibitem
+ organization empty$
+ { format.authors "author and organization" output.check }
+ { author empty$
+ { organization }
+ { format.authors organization paren space.connect }
+ if$
+ "author and organization" output.check
+ }
+ if$
+ journal emphasize "journal" output.check
+ format.pages.patent "pages" output.check
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {phdthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ bbl.phd format.thesis.type output
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+ title format.title "title" output.check
+ address output
+ format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
+ fin.entry
+}
+
+FUNCTION {remark}
+{ output.bibitem
+ note "note" output.check
+ fin.entry
+}
+
+FUNCTION {submitted}
+{ output.bibitem
+ format.authors "author" output.check
+ bbl.submitted output
+ fin.entry
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+ format.authors "author" output.check
+ title format.title "title" output.check
+ institution
+ type empty$
+ 'bbl.techreport
+ 'type
+ if$
+ space.connect
+ number empty$
+ { "t" change.case$ }
+ { number tie.or.space.connect }
+ if$
+ output
+ format.pub.address output
+ format.date "year" output.check
+ fin.entry
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+ format.authors "author" output.check
+ journal empty$
+ 'skip$
+ { journal emphasize "journal" output.check }
+ if$
+ doi empty$
+ { note output }
+ { "DOI" doi tie.or.space.connect output }
+ if$
+ fin.entry
+ empty.doi.note
+}
+
+FUNCTION {conference} {inproceedings}
+
+FUNCTION {other} {patent}
+
+FUNCTION {default.type} {misc}
+
+MACRO {jan} {"January"}
+MACRO {feb} {"February"}
+MACRO {mar} {"March"}
+MACRO {apr} {"April"}
+MACRO {may} {"May"}
+MACRO {jun} {"June"}
+MACRO {jul} {"July"}
+MACRO {aug} {"August"}
+MACRO {sep} {"September"}
+MACRO {oct} {"October"}
+MACRO {nov} {"November"}
+MACRO {dec} {"December"}
+
+READ
+
+STRINGS { longest.label }
+
+INTEGERS { number.label longest.label.width }
+
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+ #1 'number.label :=
+ #0 'longest.label.width :=
+}
+
+FUNCTION {longest.label.pass}
+{ number.label int.to.str$ 'label :=
+ number.label #1 + 'number.label :=
+ label width$ longest.label.width >
+ { label 'longest.label :=
+ label width$ 'longest.label.width :=
+ }
+ 'skip$
+ if$
+}
+
+EXECUTE {initialize.longest.label}
+
+ITERATE {longest.label.pass}
+
+FUNCTION {begin.bib}
+{ preamble$ empty$
+ 'skip$
+ { preamble$ write$ newline$ }
+ if$
+ "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+}
+
+EXECUTE {begin.bib}
+
+EXECUTE {init.state.consts}
+
+ITERATE {call.type$}
+
+FUNCTION {end.bib}
+{ newline$
+ "\end{thebibliography}" write$ newline$
+}
+
+EXECUTE {end.bib}
+%%
+%%
+%% End of file `angew.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/rsc/rsc-mc.bst b/Master/texmf-dist/bibtex/bst/rsc/rsc-mc.bst
index f865a76f0ab..db2b025c32e 100644
--- a/Master/texmf-dist/bibtex/bst/rsc/rsc-mc.bst
+++ b/Master/texmf-dist/bibtex/bst/rsc/rsc-mc.bst
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% rsc.dtx (with options: `bib-mc')
+%% rsc.dtx (with options: `bib,rsc,mc')
%% ----------------------------------------------------------------
%% The rsc package - BibTeX and macro support for Royal Society
-%% of Chemistry style articles
+%% of Chemistry and Wiley chemistry articles
%% Maintained by Joseph A. Wright
%% E-mail: joseph.wright@morningstar2.co.uk
%% Released under the GNU General Public License
@@ -51,34 +51,29 @@ FUNCTION {init.state.consts}
}
FUNCTION {add.comma}
-{ duplicate$
- #-1 #1 substring$ "}" =
- { #-2 #1024 substring$ ";} " * }
- { ", " * }
- if$
-}
+{ ", " * }
STRINGS { s t }
FUNCTION {output.nonnull}
{ 's :=
output.state mid.sentence =
- { ", " * write$ }
+ { add.comma write$ }
{ output.state after.block =
- { add.comma write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { output.state after.item =
- { " " * write$ }
- { add.period$ " " * write$ }
+ { add.comma write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { output.state after.item =
+ { " " * write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
if$
}
- if$
- }
- if$
+ if$
mid.sentence 'output.state :=
}
if$
@@ -109,6 +104,7 @@ FUNCTION {output.bibitem}
""
before.all 'output.state :=
}
+
FUNCTION {fin.entry}
{ write$
"\relax" write$
@@ -162,15 +158,24 @@ FUNCTION {paren}
if$
}
+FUNCTION {bbl.and}
+{ "and" }
+
FUNCTION {bbl.chapter}
{ "ch." }
-FUNCTION {bbl.ed}
-{ "ed. " }
+FUNCTION {bbl.editor}
+{ "ed." }
FUNCTION {bbl.edition}
{ "edn." }
+FUNCTION {bbl.etal}
+{ "et~al." emphasize }
+
+FUNCTION {bbl.in}
+{ "in" }
+
FUNCTION {bbl.inpress}
{ "in press" }
@@ -193,7 +198,7 @@ FUNCTION {bbl.techreport}
{ "Technical Report" }
FUNCTION {bbl.volume}
-{ "vol."}
+{ "vol." }
FUNCTION {bbl.first}
{ "1st" }
@@ -243,10 +248,20 @@ FUNCTION {eng.ord}
if$
}
-FUNCTION {is.num}
-{ chr.to.int$
- duplicate$ "0" chr.to.int$ < not
- swap$ "9" chr.to.int$ > not and
+FUNCTION{is.a.digit}
+{ duplicate$ "" =
+ {pop$ #0}
+ {chr.to.int$ #48 - duplicate$
+ #0 < swap$ #9 > or not}
+ if$
+}
+
+FUNCTION{is.a.number}
+{
+ { duplicate$ #1 #1 substring$ is.a.digit }
+ {#2 global.max$ substring$}
+ while$
+ "" =
}
FUNCTION {extract.num}
@@ -255,7 +270,7 @@ FUNCTION {extract.num}
{ t empty$ not }
{ t #1 #1 substring$
t #2 global.max$ substring$ 't :=
- duplicate$ is.num
+ duplicate$ is.a.number
{ s swap$ * 's := }
{ pop$ "" 't := }
if$
@@ -270,8 +285,7 @@ FUNCTION {extract.num}
FUNCTION {bibinfo.check}
{ swap$
duplicate$ missing$
- {
- pop$ pop$
+ { pop$ pop$
""
}
{ duplicate$ empty$
@@ -298,7 +312,7 @@ FUNCTION {convert.edition}
{ bbl.fourth 't := }
{ s "fifth" = s "5" = or
{ bbl.fifth 't := }
- { s #1 #1 substring$ is.num
+ { s #1 #1 substring$ is.a.number
{ s eng.ord 't := }
{ edition 't := }
if$
@@ -324,9 +338,7 @@ FUNCTION {tie.or.space.connect}
}
FUNCTION {space.connect}
-{ " "
- swap$ * *
-}
+{ " " swap$ * * }
INTEGERS { nameptr namesleft numnames }
@@ -336,26 +348,26 @@ FUNCTION {format.names}
s num.names$ 'numnames :=
numnames 'namesleft :=
{ namesleft #0 > }
- { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
- nameptr #1 >
- { namesleft #1 >
- { ", " * t * }
- { numnames #2 >
- { "" * }
- 'skip$
+ { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+ nameptr #1 >
+ { namesleft #1 >
+ { add.comma t * }
+ { numnames #2 >
+ { "" * }
+ 'skip$
if$
- t "others" =
- { " \emph{et~al.}" * }
- { " and " * t * }
+ t "others" =
+ { bbl.etal space.connect }
+ { bbl.and space.connect t space.connect }
if$
- }
- if$
- }
- 't
+ }
+ if$
+ }
+ 't
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
- }
+ }
while$
}
@@ -371,28 +383,12 @@ FUNCTION {format.editors}
{ editor empty$
{ "" }
{ #2 'author.or.editor :=
- bbl.ed *
+ bbl.editor " " * *
editor format.names
}
if$
}
-FUNCTION{is.a.digit}
-{
- duplicate$ "" =
- {pop$ #0}
- {chr.to.int$ #48 - duplicate$
- #0 < swap$ #9 > or not}
- if$
-}
-
-FUNCTION{is.a.number}
-{
- {duplicate$ #1 #1 substring$ is.a.digit }
- {#2 global.max$ substring$}
- while$
- "" =
-}
FUNCTION {n.separate.multi}
{ 't :=
""
@@ -400,7 +396,7 @@ FUNCTION {n.separate.multi}
t text.length$ #4 > t is.a.number and
{
{ t empty$ not }
- { t #-1 #1 substring$ is.num
+ { t #-1 #1 substring$ is.a.number
{ numnames #1 + 'numnames := }
{ #0 'numnames := }
if$
@@ -421,29 +417,30 @@ FUNCTION {n.separate.multi}
if$
}
-FUNCTION {format.title.noemph}
-{ title empty$
+FUNCTION {format.bvolume}
+{ volume empty$
{ "" }
- { title }
+ { bbl.volume volume tie.or.space.connect }
if$
}
-FUNCTION {format.title}
-{ title empty$
+FUNCTION {format.title.noemph}
+{ 't :=
+ t empty$
{ "" }
- { title emphasize }
+ { t }
if$
}
-FUNCTION {format.booktitle}
-{ booktitle title empty$
+FUNCTION {format.title}
+{ 't :=
+ t empty$
{ "" }
- { booktitle emphasize }
+ { t emphasize }
if$
}
-FUNCTION {n.dashify}
-{ 't :=
+FUNCTION {n.dashify} { 't :=
""
{ t empty$ not }
{ t #1 #1 substring$ "-" =
@@ -470,7 +467,7 @@ FUNCTION {n.dashify}
FUNCTION {format.date}
{ year empty$
{ "" }
- { year }
+ 'year
if$
}
@@ -488,33 +485,6 @@ FUNCTION {either.or.check}
if$
}
-FUNCTION {format.bvolume}
-{ volume empty$
- { "" }
- { bbl.volume volume tie.or.space.connect }
- if$
-}
-
-FUNCTION {format.number.series}
-{ volume empty$
- { number empty$
- { series field.or.null }
- { output.state mid.sentence =
- { "no." }
- { "No." }
- if$
- number tie.or.space.connect
- series empty$
- { "There's a number but no series in " cite$ * warning$ }
- { " in " * series * }
- if$
- }
- if$
- }
- { "" }
- if$
-}
-
FUNCTION {format.edition}
{ edition duplicate$ empty$
'skip$
@@ -572,6 +542,7 @@ FUNCTION {format.pages.required}
}
if$
}
+
FUNCTION {format.pages.nopp}
{ pages empty$
{ ""
@@ -601,7 +572,7 @@ FUNCTION {format.vol.pages}
{ volume boldface field.or.null
duplicate$ empty$
{ pop$ format.pages.required }
- { ", " * pages n.dashify * }
+ { add.comma pages n.dashify * }
if$
}
@@ -615,40 +586,21 @@ FUNCTION {format.chapter.pages}
chapter tie.or.space.connect
pages empty$
'skip$
- { ", " * format.pages * }
+ { add.comma format.pages * }
if$
}
if$
}
-FUNCTION {format.in.ed.booktitle}
-{ booktitle empty$
- { "" }
- { editor empty$
- { "in " booktitle emphasize * }
- { "in " format.editors * ", " * booktitle emphasize * }
- if$
- }
- if$
-}
-
-FUNCTION {format.in.title.ed}
-{ title empty$
- { "" }
- { editor empty$
- { " in " title emphasize * }
- { " in " title emphasize * ", " * format.editors * }
- if$
- }
- if$
-}
-
-FUNCTION {format.in.booktitle.ed}
-{ booktitle empty$
+FUNCTION {format.title.in}
+{ 's :=
+ s empty$
{ "" }
{ editor empty$
- { " in " booktitle emphasize * }
- { " in " booktitle emphasize * ", " * format.editors * }
+ { bbl.in s format.title space.connect }
+ { bbl.in s format.title space.connect
+ add.comma format.editors *
+ }
if$
}
if$
@@ -659,7 +611,7 @@ FUNCTION {format.pub.address}
{ "" }
{ address empty$
{ publisher }
- { publisher ", " * address *}
+ { publisher add.comma address *}
if$
}
if$
@@ -707,28 +659,32 @@ FUNCTION {article}
FUNCTION {book}
{ output.bibitem
author empty$
- { format.title "title" output.check
+ { title format.title "title" output.check
editor empty$
- { "Need either an author or editor for " cite$ * warning$ }
- { "" format.editors * "editor" output.check }
- if$
+ { "Need either an author or editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
}
- { format.authors output.nonnull
+ { format.authors output
"author and editor" editor either.or.check
- format.title "title" output.check
+ title format.title "title" output.check
}
if$
format.pub.address "publisher" output.check
format.edition output
format.bdate "year" output.check
format.bvolume output
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
fin.entry
}
FUNCTION {booklet}
{ output.bibitem
format.authors output
- format.title "title" output.check
+ title format.title "title" output.check
howpublished output
address output
format.date output
@@ -738,14 +694,14 @@ FUNCTION {booklet}
FUNCTION {inbook}
{ output.bibitem
author empty$
- { format.title "title" output.check
+ { title format.title "title" output.check
editor empty$
{ "Need at least an author or an editor for " cite$ * warning$ }
{ "" format.editors * "editor" output.check }
if$
}
- { format.authors output.nonnull
- format.in.title.ed "title" output.check
+ { format.authors output
+ title format.title.in "title" output.check
}
if$
format.pub.address "publisher" output.check
@@ -759,14 +715,14 @@ FUNCTION {inbook}
FUNCTION {incollection}
{ output.bibitem
author empty$
- { format.booktitle "booktitle" output.check
+ { booktitle format.title "booktitle" output.check
editor empty$
- { "Need at least an author or an editor for " cite$ * warning$ }
- { "" format.editors * "editor" output.check }
- if$
+ { "Need at least an author or an editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
}
- { format.authors output.nonnull
- format.in.booktitle.ed "booktitle" output.check
+ { format.authors output
+ booktitle format.title.in "booktitle" output.check
}
if$
format.pub.address "publisher" output.check
@@ -788,9 +744,13 @@ FUNCTION {inpress}
FUNCTION {inproceedings}
{ output.bibitem
format.authors "author" output.check
- booktitle "booktitle" output.check
+ booktitle format.title.noemph "booktitle" output.check
address output
format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
fin.entry
}
@@ -799,14 +759,14 @@ FUNCTION {manual}
author empty$
{ organization empty$
'skip$
- { organization output.nonnull
+ { organization output
address output
}
if$
}
- { format.authors output.nonnull }
+ { format.authors output }
if$
- format.title "title" output.check
+ title format.title "title" output.check
author empty$
{ organization empty$
{ address output }
@@ -825,7 +785,7 @@ FUNCTION {manual}
FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
- bbl.msc emphasize format.thesis.type output.nonnull
+ bbl.msc emphasize format.thesis.type output
school "school" output.check
address output
format.date "year" output.check
@@ -835,9 +795,9 @@ FUNCTION {mastersthesis}
FUNCTION {misc}
{ output.bibitem
format.authors output
- format.title output
+ title format.title output
howpublished output
- format.bdate output
+ year output
note output
fin.entry
empty.misc.check
@@ -863,7 +823,7 @@ FUNCTION {patent}
FUNCTION {phdthesis}
{ output.bibitem
format.authors "author" output.check
- bbl.phd emphasize format.thesis.type output.nonnull
+ bbl.phd emphasize format.thesis.type output
school "school" output.check
address output
format.date "year" output.check
@@ -872,9 +832,13 @@ FUNCTION {phdthesis}
FUNCTION {proceedings}
{ output.bibitem
- format.title.noemph "title" output.check
+ title format.title.noemph "title" output.check
address output
format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
fin.entry
}
@@ -894,7 +858,7 @@ FUNCTION {submitted}
FUNCTION {techreport}
{ output.bibitem
format.authors "author" output.check
- format.title "title" output.check
+ title format.title "title" output.check
institution
type empty$
'bbl.techreport
@@ -905,7 +869,7 @@ FUNCTION {techreport}
{ "t" change.case$ }
{ number tie.or.space.connect }
if$
- output.nonnull
+ output
format.pub.address output
format.date "year" output.check
fin.entry
@@ -921,7 +885,8 @@ FUNCTION {unpublished}
doi empty$
{ note output }
{ format.date output
- "DOI:" doi tie.or.space.connect output }
+ "DOI:" doi tie.or.space.connect output
+ }
if$
fin.entry
empty.doi.note
@@ -993,6 +958,6 @@ FUNCTION {end.bib}
}
EXECUTE {end.bib}
-\endinput
+%%
%%
%% End of file `rsc-mc.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
index 82b778ac3e9..012d9609d01 100644
--- a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
+++ b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% rsc.dtx (with options: `bib')
+%% rsc.dtx (with options: `bib,rsc')
%% ----------------------------------------------------------------
%% The rsc package - BibTeX and macro support for Royal Society
-%% of Chemistry style articles
+%% of Chemistry and Wiley chemistry articles
%% Maintained by Joseph A. Wright
%% E-mail: joseph.wright@morningstar2.co.uk
%% Released under the GNU General Public License
@@ -51,34 +51,29 @@ FUNCTION {init.state.consts}
}
FUNCTION {add.comma}
-{ duplicate$
- #-1 #1 substring$ "}" =
- { #-2 #1024 substring$ ";} " * }
- { ", " * }
- if$
-}
+{ ", " * }
STRINGS { s t }
FUNCTION {output.nonnull}
{ 's :=
output.state mid.sentence =
- { ", " * write$ }
+ { add.comma write$ }
{ output.state after.block =
- { add.comma write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { output.state after.item =
- { " " * write$ }
- { add.period$ " " * write$ }
+ { add.comma write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { output.state after.item =
+ { " " * write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
if$
}
- if$
- }
- if$
+ if$
mid.sentence 'output.state :=
}
if$
@@ -109,6 +104,7 @@ FUNCTION {output.bibitem}
""
before.all 'output.state :=
}
+
FUNCTION {fin.entry}
{ add.period$
write$
@@ -160,15 +156,24 @@ FUNCTION {paren}
if$
}
+FUNCTION {bbl.and}
+{ "and" }
+
FUNCTION {bbl.chapter}
{ "ch." }
-FUNCTION {bbl.ed}
-{ "ed. " }
+FUNCTION {bbl.editor}
+{ "ed." }
FUNCTION {bbl.edition}
{ "edn." }
+FUNCTION {bbl.etal}
+{ "et~al." emphasize }
+
+FUNCTION {bbl.in}
+{ "in" }
+
FUNCTION {bbl.inpress}
{ "in press" }
@@ -191,7 +196,7 @@ FUNCTION {bbl.techreport}
{ "Technical Report" }
FUNCTION {bbl.volume}
-{ "vol."}
+{ "vol." }
FUNCTION {bbl.first}
{ "1st" }
@@ -241,10 +246,20 @@ FUNCTION {eng.ord}
if$
}
-FUNCTION {is.num}
-{ chr.to.int$
- duplicate$ "0" chr.to.int$ < not
- swap$ "9" chr.to.int$ > not and
+FUNCTION{is.a.digit}
+{ duplicate$ "" =
+ {pop$ #0}
+ {chr.to.int$ #48 - duplicate$
+ #0 < swap$ #9 > or not}
+ if$
+}
+
+FUNCTION{is.a.number}
+{
+ { duplicate$ #1 #1 substring$ is.a.digit }
+ {#2 global.max$ substring$}
+ while$
+ "" =
}
FUNCTION {extract.num}
@@ -253,7 +268,7 @@ FUNCTION {extract.num}
{ t empty$ not }
{ t #1 #1 substring$
t #2 global.max$ substring$ 't :=
- duplicate$ is.num
+ duplicate$ is.a.number
{ s swap$ * 's := }
{ pop$ "" 't := }
if$
@@ -268,8 +283,7 @@ FUNCTION {extract.num}
FUNCTION {bibinfo.check}
{ swap$
duplicate$ missing$
- {
- pop$ pop$
+ { pop$ pop$
""
}
{ duplicate$ empty$
@@ -296,7 +310,7 @@ FUNCTION {convert.edition}
{ bbl.fourth 't := }
{ s "fifth" = s "5" = or
{ bbl.fifth 't := }
- { s #1 #1 substring$ is.num
+ { s #1 #1 substring$ is.a.number
{ s eng.ord 't := }
{ edition 't := }
if$
@@ -322,9 +336,7 @@ FUNCTION {tie.or.space.connect}
}
FUNCTION {space.connect}
-{ " "
- swap$ * *
-}
+{ " " swap$ * * }
INTEGERS { nameptr namesleft numnames }
@@ -334,26 +346,26 @@ FUNCTION {format.names}
s num.names$ 'numnames :=
numnames 'namesleft :=
{ namesleft #0 > }
- { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
- nameptr #1 >
- { namesleft #1 >
- { ", " * t * }
- { numnames #2 >
- { "" * }
- 'skip$
+ { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+ nameptr #1 >
+ { namesleft #1 >
+ { add.comma t * }
+ { numnames #2 >
+ { "" * }
+ 'skip$
if$
- t "others" =
- { " \emph{et~al.}" * }
- { " and " * t * }
+ t "others" =
+ { bbl.etal space.connect }
+ { bbl.and space.connect t space.connect }
if$
- }
- if$
- }
- 't
+ }
+ if$
+ }
+ 't
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
- }
+ }
while$
}
@@ -369,28 +381,12 @@ FUNCTION {format.editors}
{ editor empty$
{ "" }
{ #2 'author.or.editor :=
- bbl.ed *
+ bbl.editor " " * *
editor format.names
}
if$
}
-FUNCTION{is.a.digit}
-{
- duplicate$ "" =
- {pop$ #0}
- {chr.to.int$ #48 - duplicate$
- #0 < swap$ #9 > or not}
- if$
-}
-
-FUNCTION{is.a.number}
-{
- {duplicate$ #1 #1 substring$ is.a.digit }
- {#2 global.max$ substring$}
- while$
- "" =
-}
FUNCTION {n.separate.multi}
{ 't :=
""
@@ -398,7 +394,7 @@ FUNCTION {n.separate.multi}
t text.length$ #4 > t is.a.number and
{
{ t empty$ not }
- { t #-1 #1 substring$ is.num
+ { t #-1 #1 substring$ is.a.number
{ numnames #1 + 'numnames := }
{ #0 'numnames := }
if$
@@ -419,29 +415,30 @@ FUNCTION {n.separate.multi}
if$
}
-FUNCTION {format.title.noemph}
-{ title empty$
+FUNCTION {format.bvolume}
+{ volume empty$
{ "" }
- { title }
+ { bbl.volume volume tie.or.space.connect }
if$
}
-FUNCTION {format.title}
-{ title empty$
+FUNCTION {format.title.noemph}
+{ 't :=
+ t empty$
{ "" }
- { title emphasize }
+ { t }
if$
}
-FUNCTION {format.booktitle}
-{ booktitle title empty$
+FUNCTION {format.title}
+{ 't :=
+ t empty$
{ "" }
- { booktitle emphasize }
+ { t emphasize }
if$
}
-FUNCTION {n.dashify}
-{ 't :=
+FUNCTION {n.dashify} { 't :=
""
{ t empty$ not }
{ t #1 #1 substring$ "-" =
@@ -468,7 +465,7 @@ FUNCTION {n.dashify}
FUNCTION {format.date}
{ year empty$
{ "" }
- { year }
+ 'year
if$
}
@@ -486,33 +483,6 @@ FUNCTION {either.or.check}
if$
}
-FUNCTION {format.bvolume}
-{ volume empty$
- { "" }
- { bbl.volume volume tie.or.space.connect }
- if$
-}
-
-FUNCTION {format.number.series}
-{ volume empty$
- { number empty$
- { series field.or.null }
- { output.state mid.sentence =
- { "no." }
- { "No." }
- if$
- number tie.or.space.connect
- series empty$
- { "There's a number but no series in " cite$ * warning$ }
- { " in " * series * }
- if$
- }
- if$
- }
- { "" }
- if$
-}
-
FUNCTION {format.edition}
{ edition duplicate$ empty$
'skip$
@@ -570,6 +540,7 @@ FUNCTION {format.pages.required}
}
if$
}
+
FUNCTION {format.pages.nopp}
{ pages empty$
{ ""
@@ -599,7 +570,7 @@ FUNCTION {format.vol.pages}
{ volume boldface field.or.null
duplicate$ empty$
{ pop$ format.pages.required }
- { ", " * pages n.dashify * }
+ { add.comma pages n.dashify * }
if$
}
@@ -613,40 +584,21 @@ FUNCTION {format.chapter.pages}
chapter tie.or.space.connect
pages empty$
'skip$
- { ", " * format.pages * }
+ { add.comma format.pages * }
if$
}
if$
}
-FUNCTION {format.in.ed.booktitle}
-{ booktitle empty$
- { "" }
- { editor empty$
- { "in " booktitle emphasize * }
- { "in " format.editors * ", " * booktitle emphasize * }
- if$
- }
- if$
-}
-
-FUNCTION {format.in.title.ed}
-{ title empty$
- { "" }
- { editor empty$
- { " in " title emphasize * }
- { " in " title emphasize * ", " * format.editors * }
- if$
- }
- if$
-}
-
-FUNCTION {format.in.booktitle.ed}
-{ booktitle empty$
+FUNCTION {format.title.in}
+{ 's :=
+ s empty$
{ "" }
{ editor empty$
- { " in " booktitle emphasize * }
- { " in " booktitle emphasize * ", " * format.editors * }
+ { bbl.in s format.title space.connect }
+ { bbl.in s format.title space.connect
+ add.comma format.editors *
+ }
if$
}
if$
@@ -657,7 +609,7 @@ FUNCTION {format.pub.address}
{ "" }
{ address empty$
{ publisher }
- { publisher ", " * address *}
+ { publisher add.comma address *}
if$
}
if$
@@ -705,28 +657,32 @@ FUNCTION {article}
FUNCTION {book}
{ output.bibitem
author empty$
- { format.title "title" output.check
+ { title format.title "title" output.check
editor empty$
- { "Need either an author or editor for " cite$ * warning$ }
- { "" format.editors * "editor" output.check }
- if$
+ { "Need either an author or editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
}
- { format.authors output.nonnull
+ { format.authors output
"author and editor" editor either.or.check
- format.title "title" output.check
+ title format.title "title" output.check
}
if$
format.pub.address "publisher" output.check
format.edition output
format.bdate "year" output.check
format.bvolume output
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
fin.entry
}
FUNCTION {booklet}
{ output.bibitem
format.authors output
- format.title "title" output.check
+ title format.title "title" output.check
howpublished output
address output
format.date output
@@ -736,14 +692,14 @@ FUNCTION {booklet}
FUNCTION {inbook}
{ output.bibitem
author empty$
- { format.title "title" output.check
+ { title format.title "title" output.check
editor empty$
{ "Need at least an author or an editor for " cite$ * warning$ }
{ "" format.editors * "editor" output.check }
if$
}
- { format.authors output.nonnull
- format.in.title.ed "title" output.check
+ { format.authors output
+ title format.title.in "title" output.check
}
if$
format.pub.address "publisher" output.check
@@ -757,14 +713,14 @@ FUNCTION {inbook}
FUNCTION {incollection}
{ output.bibitem
author empty$
- { format.booktitle "booktitle" output.check
+ { booktitle format.title "booktitle" output.check
editor empty$
- { "Need at least an author or an editor for " cite$ * warning$ }
- { "" format.editors * "editor" output.check }
- if$
+ { "Need at least an author or an editor for " cite$ * warning$ }
+ { "" format.editors * "editor" output.check }
+ if$
}
- { format.authors output.nonnull
- format.in.booktitle.ed "booktitle" output.check
+ { format.authors output
+ booktitle format.title.in "booktitle" output.check
}
if$
format.pub.address "publisher" output.check
@@ -786,9 +742,13 @@ FUNCTION {inpress}
FUNCTION {inproceedings}
{ output.bibitem
format.authors "author" output.check
- booktitle "booktitle" output.check
+ booktitle format.title.noemph "booktitle" output.check
address output
format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
fin.entry
}
@@ -797,14 +757,14 @@ FUNCTION {manual}
author empty$
{ organization empty$
'skip$
- { organization output.nonnull
+ { organization output
address output
}
if$
}
- { format.authors output.nonnull }
+ { format.authors output }
if$
- format.title "title" output.check
+ title format.title "title" output.check
author empty$
{ organization empty$
{ address output }
@@ -823,7 +783,7 @@ FUNCTION {manual}
FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
- bbl.msc emphasize format.thesis.type output.nonnull
+ bbl.msc emphasize format.thesis.type output
school "school" output.check
address output
format.date "year" output.check
@@ -833,9 +793,9 @@ FUNCTION {mastersthesis}
FUNCTION {misc}
{ output.bibitem
format.authors output
- format.title output
+ title format.title output
howpublished output
- format.bdate output
+ year output
note output
fin.entry
empty.misc.check
@@ -861,7 +821,7 @@ FUNCTION {patent}
FUNCTION {phdthesis}
{ output.bibitem
format.authors "author" output.check
- bbl.phd emphasize format.thesis.type output.nonnull
+ bbl.phd emphasize format.thesis.type output
school "school" output.check
address output
format.date "year" output.check
@@ -870,9 +830,13 @@ FUNCTION {phdthesis}
FUNCTION {proceedings}
{ output.bibitem
- format.title.noemph "title" output.check
+ title format.title.noemph "title" output.check
address output
format.date "year" output.check
+ pages empty$
+ 'skip$
+ { format.pages output }
+ if$
fin.entry
}
@@ -892,7 +856,7 @@ FUNCTION {submitted}
FUNCTION {techreport}
{ output.bibitem
format.authors "author" output.check
- format.title "title" output.check
+ title format.title "title" output.check
institution
type empty$
'bbl.techreport
@@ -903,7 +867,7 @@ FUNCTION {techreport}
{ "t" change.case$ }
{ number tie.or.space.connect }
if$
- output.nonnull
+ output
format.pub.address output
format.date "year" output.check
fin.entry
@@ -919,7 +883,8 @@ FUNCTION {unpublished}
doi empty$
{ note output }
{ format.date output
- "DOI:" doi tie.or.space.connect output }
+ "DOI:" doi tie.or.space.connect output
+ }
if$
fin.entry
empty.doi.note
@@ -991,6 +956,6 @@ FUNCTION {end.bib}
}
EXECUTE {end.bib}
-\endinput
+%%
%%
%% End of file `rsc.bst'.