From eaa4f865b66ffe5a801a843aadda3c96b668919d Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Sat, 26 Feb 2011 04:56:00 +0000 Subject: [PATCH] Simplify bibliography system. This patch contains some makefile work by Graham, but it's not worth trying to separate it into two separate patches. --- Documentation/GNUmakefile | 7 +- .../{essay/texi-long.bst => lily-bib.bst} | 0 Documentation/web/others-did.bib | 17 +- Documentation/web/texi-web.bst | 1374 ----------------- Documentation/web/we-wrote.bib | 9 +- make/website.make | 2 + scripts/build/bib2texi.py | 19 +- 7 files changed, 30 insertions(+), 1398 deletions(-) rename Documentation/{essay/texi-long.bst => lily-bib.bst} (100%) delete mode 100644 Documentation/web/texi-web.bst diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index d4246294e5..4696170e42 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -113,16 +113,19 @@ $(outdir)/contributor.texi: $(outdir)/ROADMAP ### bad hack for badly-integrated bibliography $(outdir)/colorado.itexi: BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(outdir)/colorado.itexi \ $(src-dir)/essay/colorado.bib $(outdir)/computer-notation.itexi: BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(outdir)/computer-notation.itexi \ $(src-dir)/essay/computer-notation.bib $(outdir)/engravingbib.itexi: BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(outdir)/engravingbib.itexi \ $(src-dir)/essay/engravingbib.bib @@ -133,13 +136,13 @@ $(outdir)/essay.texi: \ $(outdir)/others-did.itexi: BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \ - -s web \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(outdir)/others-did.itexi \ $(src-dir)/web/others-did.bib $(outdir)/we-wrote.itexi: BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \ - -s web \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(outdir)/we-wrote.itexi \ $(src-dir)/web/we-wrote.bib diff --git a/Documentation/essay/texi-long.bst b/Documentation/lily-bib.bst similarity index 100% rename from Documentation/essay/texi-long.bst rename to Documentation/lily-bib.bst diff --git a/Documentation/web/others-did.bib b/Documentation/web/others-did.bib index 8caa40c9d6..1d9627af7d 100644 --- a/Documentation/web/others-did.bib +++ b/Documentation/web/others-did.bib @@ -1,16 +1,15 @@ -# use two {{ for title, but one { for all others. @inproceedings{percival08, - title = {{Generating Targeted Rhythmic Exercises for Music Students -with Constraint Satisfaction Programming}}, + title = {Generating Targeted Rhythmic Exercises for Music Students +with Constraint Satisfaction Programming}, author = {Graham Percival and Tosten Anders and George Tzanetakis}, booktitle = {International Computer Music Conference}, year = 2008, } @inproceedings{passos09, - title = {{Functional Harmonic Analysis and Computational Musicology -in Rameau}}, + title = {Functional Harmonic Analysis and Computational Musicology +in Rameau}, author = {Alexandre Tachard Passos and Marcos Sampaio and Pedro Kröger and Givaldo de Cidra}, booktitle = {Proceedings of the 12th Brazilian Symposium on Computer @@ -20,8 +19,8 @@ Music}, } @inproceedings{simoes07, - title = {{Using Text Mining Techniques for Classical Music Scores -Analysis}}, + title = {Using Text Mining Techniques for Classical Music Scores +Analysis}, author = {Alberto Simões and Anália Lourenço and José João Almeida}, booktitle = {New Trends in Artificial Intelligence}, editor = {J. Neves et al.}, @@ -29,8 +28,8 @@ Analysis}}, } @inproceedings{baird05, - title = {{Real-time generation of music notation via audience interaction using -python and GNU LilyPond}}, + title = {Real-time generation of music notation via audience interaction using +python and GNU LilyPond}, author = {Kevin C. Baird}, booktitle = {New Interfaces for Music Expression}, year = 2005, diff --git a/Documentation/web/texi-web.bst b/Documentation/web/texi-web.bst deleted file mode 100644 index 290c8614e1..0000000000 --- a/Documentation/web/texi-web.bst +++ /dev/null @@ -1,1374 +0,0 @@ -% 18/aug/2010: -% - changed into texi-long.bst by Graham Percival for GNU LilyPond -% - only a minimum of changes were made; some html remains in -% this file, but it does not appear in our output -% BibTeX bibliography style `html-long' -% spits out texinfo-formatted bibliography in place of bbl output -% by David Kotz dfk@cs.dartmouth.edu -% $Id: html-long.bst,v 1.4 2005/07/21 21:29:50 hjunes Exp $ -% modified from -% BibTeX standard bibliography style `alpha' - % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09. - % Copyright (C) 1985, all rights reserved. - % Copying of this file is authorized only if either - % (1) you make absolutely no changes to your copy, including name, or - % (2) if you do make changes, you name it something other than - % btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst. - % This restriction helps ensure that all standard styles are identical. - % The file btxbst.doc has the documentation for this style. - -% DFK added abstract, comment, earlier, keyword, later, URL -ENTRY - { abstract - address - author - booktitle - chapter - comment - earlier - edition - editor - howpublished - institution - journal - key - keyword - later - month - note - number - organization - pages - private - publisher - school - series - title - type - URL - volume - year - } - {} - { label extra.label sort.label } - -INTEGERS { output.state before.all mid.sentence after.sentence after.block } - -FUNCTION {init.state.consts} -{ #0 'before.all := - #1 'mid.sentence := - #2 'after.sentence := - #3 'after.block := -} - -STRINGS { s t } - -FUNCTION {output.nonnull} -{ 's := - output.state mid.sentence = - { ", " * write$ } - { output.state after.block = - { add.period$ write$ - newline$ - } - { output.state before.all = - 'write$ - { add.period$ " " * write$ } - 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$ -} - -% DFK changed to use cite$ for the label -% DFK changed to texinfo, and use URL to make cite key a link -FUNCTION {output.bibitem} -{ newline$ - URL empty$ - { "@item " write$ - } - { "" quote$ * cite$ * quote$ * " HREF=" * quote$ * - URL * quote$ * "> " * cite$ * ":" * write$ - } - if$ - newline$ -% "" write$ newline$ - "" - before.all 'output.state := -} - -% DFK changed to HTML -FUNCTION {fin.entry} -{ add.period$ - write$ - newline$ - earlier empty$ - 'skip$ - { "
" write$ newline$ - "See also earlier version " * earlier * "." * write$ newline$ - } - if$ - later empty$ - 'skip$ - { "
" write$ newline$ - "See also later version " * later * "." * write$ newline$ - } - if$ -% "" write$ newline$ -} - -FUNCTION {new.block} -{ output.state before.all = - 'skip$ - { after.block 'output.state := } - if$ -} - -FUNCTION {new.sentence} -{ output.state after.block = - 'skip$ - { output.state before.all = - 'skip$ - { after.sentence 'output.state := } - if$ - } - if$ -} - -FUNCTION {not} -{ { #0 } - { #1 } - if$ -} - -FUNCTION {and} -{ 'skip$ - { pop$ #0 } - if$ -} - -FUNCTION {or} -{ { pop$ #1 } - 'skip$ - if$ -} - -FUNCTION {new.block.checka} -{ empty$ - 'skip$ - 'new.block - if$ -} - -FUNCTION {new.block.checkb} -{ empty$ - swap$ empty$ - and - 'skip$ - 'new.block - if$ -} - -FUNCTION {new.sentence.checka} -{ empty$ - 'skip$ - 'new.sentence - if$ -} - -FUNCTION {new.sentence.checkb} -{ empty$ - swap$ empty$ - and - 'skip$ - 'new.sentence - if$ -} - -FUNCTION {field.or.null} -{ duplicate$ empty$ - { pop$ "" } - 'skip$ - if$ -} - -% DFK changed to texinfo -FUNCTION {emphasize} -{ duplicate$ empty$ - { pop$ "" } - { "@emph{" swap$ * "}" * } - if$ -} - -% DFK added for texinfo strong emphasis -FUNCTION {strong} -{ duplicate$ empty$ - { pop$ "" } - { "@strong{" swap$ * "}" * } - if$ -} - -INTEGERS { nameptr namesleft numnames } - -% DFK added this, to strip {} and ~ from titles and authors -% It's not a great idea, because it will screw up in math mode and some -% special characters... but it makes most things much prettier. -FUNCTION {author.title.purify} -{ 't := - "" - { t empty$ not } - { t #1 #1 substring$ "{" = - t #1 #1 substring$ "}" = or - 'skip$ - { t #1 #1 substring$ "~" = - { " " * } - { t #1 #1 substring$ * } - if$ - } - if$ - t #2 global.max$ substring$ 't := - } - while$ -} - -FUNCTION {format.names} -{ 's := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ 't := - nameptr #1 > - { namesleft #1 > - { ", " * t * } - { numnames #2 > - { "," * } - 'skip$ - if$ - t "others" = - { " et al." * } - { " and " * t * } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {format.authors} -{ author empty$ - { "" } - { author format.names author.title.purify } - if$ -} - -FUNCTION {format.editors} -{ editor empty$ - { "" } - { editor format.names author.title.purify - editor num.names$ #1 > - { ", editors" * } - { ", editor" * } - if$ - } - if$ -} - -% DFK added strong, so it will be bold. -FUNCTION {format.title} -{ title empty$ - { "" } - { title "t" change.case$ author.title.purify strong } - 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$ - { month empty$ - { "" } - { "there's a month but no year in " cite$ * warning$ - month - } - if$ - } - { month empty$ - 'year - { month " " * year * } - if$ - } - if$ -} - -% DFK changed emphasize to strong -FUNCTION {format.btitle} -{ title author.title.purify strong -} - -% PEH - the 2 same lines below are because I replaced   with a space -FUNCTION {tie.or.space.connect} -{ duplicate$ text.length$ #3 < - { " " } - { " " } - if$ - swap$ * * -} - -FUNCTION {either.or.check} -{ empty$ - 'pop$ - { "can't use both " swap$ * " fields in " * cite$ * warning$ } - if$ -} - -FUNCTION {format.bvolume} -{ volume empty$ - { "" } - { "volume" volume tie.or.space.connect - series empty$ - 'skip$ - { " of " * series emphasize * } - if$ - "volume and number" number either.or.check - } - if$ -} - -FUNCTION {format.number.series} -{ volume empty$ - { number empty$ - { series field.or.null } - { output.state mid.sentence = - { "number" } - { "Number" } - 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 empty$ - { "" } - { output.state mid.sentence = - { edition "l" change.case$ " edition" * } - { edition "t" change.case$ " edition" * } - if$ - } - 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 - { "pages" pages n.dashify tie.or.space.connect } - { "page" pages tie.or.space.connect } - if$ - } - if$ -} - -FUNCTION {format.vol.num.pages} -{ volume field.or.null - number empty$ - 'skip$ - { "(" number * ")" * * - volume empty$ - { "there's a number but no volume in " cite$ * warning$ } - 'skip$ - if$ - } - if$ - pages empty$ - 'skip$ - { duplicate$ empty$ - { pop$ format.pages } - { ":" * pages n.dashify * } - if$ - } - if$ -} - -FUNCTION {format.chapter.pages} -{ chapter empty$ - 'format.pages - { type empty$ - { "chapter" } - { type "l" change.case$ } - if$ - chapter tie.or.space.connect - pages empty$ - 'skip$ - { ", " * format.pages * } - if$ - } - if$ -} - -FUNCTION {format.in.ed.booktitle} -{ booktitle empty$ - { "" } - { editor empty$ - { "In " booktitle emphasize * } - { "In " format.editors * ", " * booktitle emphasize * } - if$ - } - if$ -} - -FUNCTION {empty.misc.check} -{ author empty$ title empty$ howpublished empty$ - month empty$ year empty$ note empty$ - and and and and and - key empty$ not and - { "all relevant fields are empty in " cite$ * warning$ } - 'skip$ - if$ -} - -FUNCTION {format.thesis.type} -{ type empty$ - 'skip$ - { pop$ - type "t" change.case$ - } - if$ -} - -FUNCTION {format.tr.number} -{ type empty$ - { "Technical Report" } - 'type - if$ - number empty$ - { "t" change.case$ } - { number tie.or.space.connect } - if$ -} - -FUNCTION {format.article.crossref} -{ key empty$ - { journal empty$ - { "need key or journal for " cite$ * " to crossref " * crossref * - warning$ - "" - } - { "In {\em " journal * "\/}" * } - if$ - } - { "In " key * } - if$ - " \cite{" * crossref * "}" * -} - -FUNCTION {format.crossref.editor} -{ editor #1 "{vv~}{ll}" format.name$ - editor num.names$ duplicate$ - #2 > - { pop$ " et al." * } - { #2 < - 'skip$ - { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = - { " et al." * } - { " and " * editor #2 "{vv~}{ll}" format.name$ * } - if$ - } - if$ - } - if$ -} - -FUNCTION {format.book.crossref} -{ volume empty$ - { "empty volume in " cite$ * "'s crossref of " * crossref * warning$ - "In " - } - { "Volume" volume tie.or.space.connect - " of " * - } - if$ - editor empty$ - editor field.or.null author field.or.null = - or - { key empty$ - { series empty$ - { "need editor, key, or series for " cite$ * " to crossref " * - crossref * warning$ - "" * - } - { "{\em " * series * "\/}" * } - if$ - } - { key * } - if$ - } - { format.crossref.editor * } - if$ - " \cite{" * crossref * "}" * -} - -FUNCTION {format.incoll.inproc.crossref} -{ editor empty$ - editor field.or.null author field.or.null = - or - { key empty$ - { booktitle empty$ - { "need editor, key, or booktitle for " cite$ * " to crossref " * - crossref * warning$ - "" - } - { "In {\em " booktitle * "\/}" * } - if$ - } - { "In " key * } - if$ - } - { "In " format.crossref.editor * } - if$ - " \cite{" * crossref * "}" * -} - - -% DFK added -% top of stack is the string we want to be a quoted paragraph -FUNCTION {format.quotedParagraph} -{ duplicate$ empty$ - { skip$ } - { "

" swap$ * "

" *} - if$ -} - - -% DFK added, to support comment, private, keyword, etc -% next-to-top is field name (eg, "Comment") -% top is field value (eg, value of comment) -% both are popped; resulting top is either empty, -% or string describing field -FUNCTION {format.dfkfield} -{ duplicate$ empty$ - { pop$ pop$ "" } - { swap$ - " " swap$ * ": " * swap$ * } - if$ -} - -% DFK added -FUNCTION {dfk.stuff} -{ new.block - "Abstract" abstract format.dfkfield format.quotedParagraph write$ newline$ - "Keyword" keyword format.dfkfield format.quotedParagraph write$ newline$ - "Comment" comment format.dfkfield format.quotedParagraph write$ newline$ -} - -% DFK: added a call to dfk.stuff in all entry-type functions below - -FUNCTION {article} -{ output.bibitem - format.authors "author" output.check - new.block - format.title "title" output.check - new.block - crossref missing$ - { journal emphasize "journal" output.check - format.vol.num.pages output - format.date "year" output.check - } - { format.article.crossref output.nonnull - format.pages output - } - if$ - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {book} -{ output.bibitem - author empty$ - { format.editors "author and editor" output.check } - { format.authors output.nonnull - crossref missing$ - { "author and editor" editor either.or.check } - 'skip$ - if$ - } - if$ - new.block - format.btitle "title" output.check - crossref missing$ - { format.bvolume output - new.block - format.number.series output - new.sentence - publisher "publisher" output.check - address output - } - { new.block - format.book.crossref output.nonnull - } - if$ - format.edition output - format.date "year" output.check - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {booklet} -{ output.bibitem - format.authors output - new.block - format.title "title" output.check - howpublished address new.block.checkb - howpublished output - address output - format.date output - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {inbook} -{ output.bibitem - author empty$ - { format.editors "author and editor" output.check } - { format.authors output.nonnull - crossref missing$ - { "author and editor" editor either.or.check } - 'skip$ - if$ - } - if$ - new.block - format.btitle "title" output.check - crossref missing$ - { format.bvolume output - format.chapter.pages "chapter and pages" output.check - new.block - format.number.series output - new.sentence - publisher "publisher" output.check - address output - } - { format.chapter.pages "chapter and pages" output.check - new.block - format.book.crossref output.nonnull - } - if$ - format.edition output - format.date "year" output.check - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {incollection} -{ output.bibitem - format.authors "author" output.check - new.block - format.title "title" output.check - new.block - crossref missing$ - { format.in.ed.booktitle "booktitle" output.check - format.bvolume output - format.number.series output - format.chapter.pages output - new.sentence - publisher "publisher" output.check - address output - format.edition output - format.date "year" output.check - } - { format.incoll.inproc.crossref output.nonnull - format.chapter.pages output - } - if$ - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {inproceedings} -{ output.bibitem - format.authors "author" output.check - new.block - format.title "title" output.check - new.block - crossref missing$ - { format.in.ed.booktitle "booktitle" output.check - format.bvolume output - format.number.series output - format.pages output - address empty$ - { organization publisher new.sentence.checkb - organization output - publisher output - format.date "year" output.check - } - { address output.nonnull - format.date "year" output.check - new.sentence - organization output - publisher output - } - if$ - } - { format.incoll.inproc.crossref output.nonnull - format.pages output - } - if$ - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {conference} { inproceedings } - -FUNCTION {manual} -{ output.bibitem - author empty$ - { organization empty$ - 'skip$ - { organization output.nonnull - address output - } - if$ - } - { format.authors output.nonnull } - if$ - new.block - format.btitle "title" output.check - author empty$ - { organization empty$ - { address new.block.checka - address output - } - 'skip$ - if$ - } - { organization address new.block.checkb - organization output - address output - } - if$ - format.edition output - format.date output - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {mastersthesis} -{ output.bibitem - format.authors "author" output.check - new.block - format.title "title" output.check - new.block - "Master's thesis" format.thesis.type output.nonnull - school "school" output.check - address output - format.date "year" output.check - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {misc} -{ output.bibitem - format.authors output - title howpublished new.block.checkb - format.title output - howpublished new.block.checka - howpublished output - format.date output - new.block - note output - fin.entry - dfk.stuff - empty.misc.check -} - -FUNCTION {phdthesis} -{ output.bibitem - format.authors "author" output.check - new.block - format.btitle "title" output.check - new.block - "PhD thesis" format.thesis.type output.nonnull - school "school" output.check - address output - format.date "year" output.check - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {proceedings} -{ output.bibitem - editor empty$ - { organization output } - { format.editors output.nonnull } - if$ - new.block - format.btitle "title" output.check - format.bvolume output - format.number.series output - address empty$ - { editor empty$ - { publisher new.sentence.checka } - { organization publisher new.sentence.checkb - organization output - } - if$ - publisher output - format.date "year" output.check - } - { address output.nonnull - format.date "year" output.check - new.sentence - editor empty$ - 'skip$ - { organization output } - if$ - publisher output - } - if$ - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {techreport} -{ output.bibitem - format.authors "author" output.check - new.block - format.title "title" output.check - new.block - format.tr.number output.nonnull - institution "institution" output.check - address output - format.date "year" output.check - new.block - note output - fin.entry - dfk.stuff -} - -FUNCTION {unpublished} -{ output.bibitem - format.authors "author" output.check - new.block - format.title "title" output.check - new.block - note "note" output.check - format.date output - fin.entry - dfk.stuff -} - -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"} - -MACRO {acmcs} {"ACM Computing Surveys"} - -MACRO {acta} {"Acta Informatica"} - -MACRO {cacm} {"Communications of the ACM"} - -MACRO {ibmjrd} {"IBM Journal of Research and Development"} - -MACRO {ibmsj} {"IBM Systems Journal"} - -MACRO {ieeese} {"IEEE Transactions on Software Engineering"} - -MACRO {ieeetc} {"IEEE Transactions on Computers"} - -MACRO {ieeetcad} - {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} - -MACRO {ipl} {"Information Processing Letters"} - -MACRO {jacm} {"Journal of the ACM"} - -MACRO {jcss} {"Journal of Computer and System Sciences"} - -MACRO {scp} {"Science of Computer Programming"} - -MACRO {sicomp} {"SIAM Journal on Computing"} - -MACRO {tocs} {"ACM Transactions on Computer Systems"} - -MACRO {tods} {"ACM Transactions on Database Systems"} - -MACRO {tog} {"ACM Transactions on Graphics"} - -MACRO {toms} {"ACM Transactions on Mathematical Software"} - -MACRO {toois} {"ACM Transactions on Office Information Systems"} - -MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"} - -MACRO {tcs} {"Theoretical Computer Science"} - -READ - -FUNCTION {sortify} -{ purify$ - "l" change.case$ -} - -INTEGERS { len } - -FUNCTION {chop.word} -{ 's := - 'len := - s #1 len substring$ = - { s len #1 + global.max$ substring$ } - 's - if$ -} - -INTEGERS { et.al.char.used } - -FUNCTION {initialize.et.al.char.used} -{ #0 'et.al.char.used := -} - -EXECUTE {initialize.et.al.char.used} - -FUNCTION {format.lab.names} -{ 's := - s num.names$ 'numnames := - numnames #1 > - { numnames #4 > - { #3 'namesleft := } - { numnames 'namesleft := } - if$ - #1 'nameptr := - "" - { namesleft #0 > } - { nameptr numnames = - { s nameptr "{ff }{vv }{ll}{ jj}" format.name$ "others" = - { "{\etalchar{+}}" * - #1 'et.al.char.used := - } - { s nameptr "{v{}}{l{}}" format.name$ * } - if$ - } - { s nameptr "{v{}}{l{}}" format.name$ * } - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ - numnames #4 > - { "{\etalchar{+}}" * - #1 'et.al.char.used := - } - 'skip$ - if$ - } - { s #1 "{v{}}{l{}}" format.name$ - duplicate$ text.length$ #2 < - { pop$ s #1 "{ll}" format.name$ #3 text.prefix$ } - 'skip$ - if$ - } - if$ -} - -FUNCTION {author.key.label} -{ author empty$ - { key empty$ - { cite$ #1 #3 substring$ } - { key #3 text.prefix$ } - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {author.editor.key.label} -{ author empty$ - { editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - { key #3 text.prefix$ } - if$ - } - { editor format.lab.names } - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {author.key.organization.label} -{ author empty$ - { key empty$ - { organization empty$ - { cite$ #1 #3 substring$ } - { "The " #4 organization chop.word #3 text.prefix$ } - if$ - } - { key #3 text.prefix$ } - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {editor.key.organization.label} -{ editor empty$ - { key empty$ - { organization empty$ - { cite$ #1 #3 substring$ } - { "The " #4 organization chop.word #3 text.prefix$ } - if$ - } - { key #3 text.prefix$ } - if$ - } - { editor format.lab.names } - if$ -} - -FUNCTION {calc.label} -{ type$ "book" = - type$ "inbook" = - or - 'author.editor.key.label - { type$ "proceedings" = - 'editor.key.organization.label - { type$ "manual" = - 'author.key.organization.label - 'author.key.label - if$ - } - if$ - } - if$ - duplicate$ - year field.or.null purify$ #-1 #2 substring$ - * - 'label := - year field.or.null purify$ #-1 #4 substring$ - * - sortify 'sort.label := -} - -FUNCTION {sort.format.names} -{ 's := - #1 'nameptr := - "" - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { nameptr #1 > - { " " * } - 'skip$ - if$ - s nameptr "{vv{ } }{ll{ }}{ ff{ }}{ jj{ }}" format.name$ 't := - nameptr numnames = t "others" = and - { "et al" * } - { t sortify * } - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {sort.format.title} -{ 't := - "A " #2 - "An " #3 - "The " #4 t chop.word - chop.word - chop.word - sortify - #1 global.max$ substring$ -} - -FUNCTION {author.sort} -{ author empty$ - { key empty$ - { "to sort, need author or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { author sort.format.names } - if$ -} - -FUNCTION {author.editor.sort} -{ author empty$ - { editor empty$ - { key empty$ - { "to sort, need author, editor, or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { editor sort.format.names } - if$ - } - { author sort.format.names } - if$ -} - -FUNCTION {author.organization.sort} -{ author empty$ - { organization empty$ - { key empty$ - { "to sort, need author, organization, or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { "The " #4 organization chop.word sortify } - if$ - } - { author sort.format.names } - if$ -} - -FUNCTION {editor.organization.sort} -{ editor empty$ - { organization empty$ - { key empty$ - { "to sort, need editor, organization, or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { "The " #4 organization chop.word sortify } - if$ - } - { editor sort.format.names } - if$ -} - -FUNCTION {presort} -{ calc.label - sort.label - " " - * - type$ "book" = - type$ "inbook" = - or - 'author.editor.sort - { type$ "proceedings" = - 'editor.organization.sort - { type$ "manual" = - 'author.organization.sort - 'author.sort - if$ - } - if$ - } - if$ - * - " " - * - year field.or.null sortify - * - " " - * - title field.or.null - sort.format.title - * -% DFK throw away stuff above and use cite$ for sort key - pop$ - cite$ - #1 entry.max$ substring$ - 'sort.key$ := -} - -ITERATE {presort} - -SORT - -STRINGS { longest.label last.sort.label next.extra } - -INTEGERS { longest.label.width last.extra.num } - -FUNCTION {initialize.longest.label} -{ "" 'longest.label := - #0 int.to.chr$ 'last.sort.label := - "" 'next.extra := - #0 'longest.label.width := - #0 'last.extra.num := -} - -FUNCTION {forward.pass} -{ last.sort.label sort.label = - { last.extra.num #1 + 'last.extra.num := - last.extra.num int.to.chr$ 'extra.label := - } - { "a" chr.to.int$ 'last.extra.num := - "" 'extra.label := - sort.label 'last.sort.label := - } - if$ -} - -FUNCTION {reverse.pass} -{ next.extra "b" = - { "a" 'extra.label := } - 'skip$ - if$ - label extra.label * 'label := - label width$ longest.label.width > - { label 'longest.label := - label width$ 'longest.label.width := - } - 'skip$ - if$ - extra.label 'next.extra := -} - -EXECUTE {initialize.longest.label} - -ITERATE {forward.pass} - -REVERSE {reverse.pass} - -% DFK removed code about et.al.char -% DFK changed to texinfo -FUNCTION {begin.bib} -{ "@c bib -> itexi intro" write$ newline$ - "@itemize" write$ newline$ -} - -EXECUTE {begin.bib} - -EXECUTE {init.state.consts} - -ITERATE {call.type$} - -% DFK changed to texinfo -FUNCTION {end.bib} -{ newline$ - "@end itemize" write$ newline$ - "@c bib -> itexi end" write$ newline$ -} - -EXECUTE {end.bib} diff --git a/Documentation/web/we-wrote.bib b/Documentation/web/we-wrote.bib index 17c793a504..aeae6d4435 100644 --- a/Documentation/web/we-wrote.bib +++ b/Documentation/web/we-wrote.bib @@ -1,7 +1,6 @@ -# use two {{ for title, but one { for all others. @inproceedings{hanwen06, - title = {{LilyPond, Automated music formatting and the Art of Shipping}}, + title = {LilyPond, Automated music formatting and the Art of Shipping}, author = {Han-Wen Nienhuys}, booktitle = {Forum Internacional Software Livre 2006 (FISL7.0)}, year = 2006, @@ -9,7 +8,7 @@ } @mastersthesis{sandberg06, - title = {{Separating input language and formatter in GNU LilyPond}}, + title = {Separating input language and formatter in GNU LilyPond}, author = {Erik Sandberg}, year = 2006, month = "March", @@ -18,11 +17,11 @@ } @inproceedings{hanwen03, - title = {{LilyPond, a system for automated music engraving}}, + title = {LilyPond, a system for automated music engraving}, author = {Han-Wen Nienhuys and Jan Nieuwenhuizen}, booktitle = {Colloquium on Musical Informatics (XIV CIM 2003)}, year = 2003, - month = May, + month = "May", location = {Firenze, Italy}, note = {(@uref{http://lilypond.org/web/images/xivcim.pdf, PDF 95k})} } diff --git a/make/website.make b/make/website.make index 0f1d10849a..e05aa8ff9d 100644 --- a/make/website.make +++ b/make/website.make @@ -86,10 +86,12 @@ website-xrefs: website-version website-bibs: website-version BSTINPUTS=$(top-src-dir)/Documentation/web \ $(WEB_BIBS) -s web \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(OUT)/others-did.itexi \ $(top-src-dir)/Documentation/web/others-did.bib BSTINPUTS=$(top-src-dir)/Documentation/web \ $(WEB_BIBS) -s web \ + -s $(top-src-dir)/Documentation/lily-bib \ -o $(OUT)/we-wrote.itexi \ $(top-src-dir)/Documentation/web/we-wrote.bib diff --git a/scripts/build/bib2texi.py b/scripts/build/bib2texi.py index 51b7d7b6f4..dd896fa8b0 100644 --- a/scripts/build/bib2texi.py +++ b/scripts/build/bib2texi.py @@ -24,10 +24,6 @@ for (o,a) in options: else: raise Exception ('unknown option: %s' % o) - -if style not in ['alpha','index','long','longp','long-pario','short','short-pario','split']: - sys.stderr.write ("Unknown style \`%s'\n" % style) - if not files: usage () sys.exit (2) @@ -47,32 +43,39 @@ files = ','.join (nf) tmpfile = tempfile.mkstemp ('bib2texi')[1] +#This writes a .aux file to the temporary directory. +#The .aux file contains the commands for bibtex +#PEH changed the bibstyle to allow a single template file in the parent directory +#The template filename is texi-*.bst, where * defaults to 'long' but can be a parameter open (tmpfile + '.aux', 'w').write (r''' \relax \citation{*} -\bibstyle{texi-%(style)s} +\bibstyle{%(style)s} \bibdata{%(files)s}''' % vars ()) tmpdir = tempfile.gettempdir () +#The command line to invoke bibtex cmd = "TEXMFOUTPUT=%s bibtex %s" % (tmpdir, tmpfile) sys.stdout.write ("Invoking `%s'\n" % cmd) +#And invoke it stat = os.system (cmd) if stat <> 0: sys.exit(1) - #TODO: do tex -> itexi on output - +# Following 2 lines copy tmpfile.bbl to the desired output file bbl = open (tmpfile + '.bbl').read () open (output, 'w').write (bbl) - def cleanup (tmpfile): for a in ['aux','bbl', 'blg']: os.unlink (tmpfile + '.' + a) + cleanup (tmpfile) +#Following line added by PEH - script was leaving a dangling temporary file with no extension +os.unlink (tmpfile) -- 2.39.2