From: fred Date: Tue, 26 Mar 2002 21:45:13 +0000 (+0000) Subject: lilypond-1.1.14 X-Git-Tag: release/1.5.59~2685 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a17df2d1c70cc3c79116229914ae8c81176635d0;p=lilypond.git lilypond-1.1.14 --- diff --git a/Documentation/BLURB.in b/Documentation/BLURB.in index 68ca4dc05e..a861e52e33 100644 --- a/Documentation/BLURB.in +++ b/Documentation/BLURB.in @@ -2,5 +2,5 @@ LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play mechanical performances to a MIDI file. Features include multiple staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas, -beams, slurs, triplets, formatting scores, part extraction. It includes -a nice font of musical symbols. +beams, slurs, triplets, named chords, transposing, formatting scores, +part extraction. It includes a nice font of musical symbols. diff --git a/Documentation/FLAPTEKST.in b/Documentation/FLAPTEKST.in index 90ee5e5d21..cedaa2e995 100644 --- a/Documentation/FLAPTEKST.in +++ b/Documentation/FLAPTEKST.in @@ -1,7 +1,7 @@ LilyPond is de muziekzetter van het GNU Project. Dit programma drukt prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan het een mechanische uitvoering afspelen naar een MIDI bestand. -Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, -sleutels, toonaarden, zangteksten, krachtige invoer taal, cadensa, -balken, boogjes, triolen, partituren, en uittreksels voor individuele -partijen. Een fraaie set muziektekens is inbegrepen. +Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, sleutels, +toonaarden, zangteksten, krachtige invoer taal, cadensa, balken, boogjes, +triolen, accoordnamen, transponeren, partituren, en uittreksels voor +individuele partijen. Een fraaie set muziektekens is inbegrepen. diff --git a/Documentation/tex/engraving.bib b/Documentation/tex/engraving.bib index 560647d93b..066a7b7063 100644 --- a/Documentation/tex/engraving.bib +++ b/Documentation/tex/engraving.bib @@ -4,7 +4,17 @@ % - +@Book{banter, + author = {Harald Banter}, + title = {Akkord Lexikon}, + publisher = {Schott's S\"ohne}, + year = {1987}, + isbn = {ISBN 3-7957-2095-8}, + note = {Comprehensive overview of commonly used + chords. Suggests (and uses) a unification for all different kinds + of chord names.}, + address = {Mainz, Germany}, +} @Book{rastall, author = {Richard Rastall}, diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index cf505663fb..a4d1fe8752 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -6,7 +6,7 @@ This document explains what you need to install LilyPond, and what you should do. If you are going to compile and install LilyPond very often you might want to check out the file(buildscripts/set-lily.sh) script. It sets some environment variables and symlinks, which comes -in handly when you have to compile LilyPond very often. +in handly when you have to compile LilyPond more often. sect(PREREQUISITES) @@ -24,11 +24,11 @@ disk-space run configure with code(--disable-debugging). Although we recommend to use Unix, LilyPond is known to run on Windows NT/95/98 as well. See Section ref(w32). -it() GNU C++ version 2.7 or newer (2.8 and egcs are also fine). +it() GNU C++ version 2.8 or newer (egcs-1.1 or newer is also fine). it() Python 1.5 (Strictly speaking, you shouldn't need Python for compiling and installing, but you'll need it to regenerate the font tables, e.g.). -it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html) +it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html). ) sect(RUNNING) @@ -41,7 +41,7 @@ it()TeX it()A PostScript printer and/or viewer (such as Ghostscript) is strongly recommended. Xdvi will show all embedded PostScript too if you have Ghostscript installed. -it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html) +it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html) ) diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index 5752409eb6..b7cfc4d16f 100644 --- a/buildscripts/lilypond-login.sh +++ b/buildscripts/lilypond-login.sh @@ -6,6 +6,7 @@ setenv GS_LIB "@datadir@/afm" setenv GS_FONTPATH "@datadir@/ps" setenv LILYINCLUDE "@datadir@/ly:@datadir@/afm" +setenv LILYPONDPREFIX "@datadir@" # include an empty path component for the system wide includes. setenv MFINPUTS "@datadir@/mf:$MFINPUTS::" diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh index 40e778f75a..b40bea1689 100644 --- a/buildscripts/lilypond-profile.sh +++ b/buildscripts/lilypond-profile.sh @@ -5,6 +5,8 @@ GS_LIB="@datadir@/afm" GS_FONTPATH="@datadir@/ps" LILYINCLUDE="@datadir@/ly:@datadir@/afm" +# bit silly. for ly2dvi, overrules compiled-in datadir... +LILYPONDPREFIX="@datadir@" # include an empty path component for the system wide includes. MFINPUTS="@datadir@/mf:"${MFINPUTS:=":"} @@ -12,7 +14,7 @@ TEXINPUTS="@datadir@/tex:@datadir@/ps:"${TEXINPUTS:=":"} GUILE_LOAD_PATH="@datadir@/scm:$GUILE_LOAD_PATH" -export GUILE_LOAD_PATH LILYINCLUDE MFINPUTS TEXINPUTS GS_LIB GS_FONTPATH +export GUILE_LOAD_PATH LILYINCLUDE LILYPONDPREFIX MFINPUTS TEXINPUTS GS_LIB GS_FONTPATH # echo $LILYINCLUDE $MFINPUTS $TEXINPUTS $GS_LIB $GS_FONTPATH diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh index ccc61338dc..67c5d80616 100644 --- a/buildscripts/set-lily.sh +++ b/buildscripts/set-lily.sh @@ -47,6 +47,8 @@ ln -sf $LILYPOND_SOURCEDIR/scripts/out/mudela-book $prefix/bin/mudela-book chmod 755 $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs ln -sf $LILYPOND_SOURCEDIR/mf/out/ afm +mkdir -p $prefix/share/lilypond +ln -sf $LILYPOND_SOURCEDIR/scm $prefix/share/lilypond if [ -f ../.gdbinit ]; then ln ../.gdbinit . diff --git a/input/bugs/bar-space.ly b/input/bugs/bar-space.ly new file mode 100644 index 0000000000..5c70a49425 --- /dev/null +++ b/input/bugs/bar-space.ly @@ -0,0 +1,16 @@ +\version "1.0.12"; + +scales = \notes\transpose c''{ + f2 f f f f f f f f f\break + } + +keys = \notes{ + \key b; s1 \key f; s1 \key f; s1 \key f; s1 \key f; s1 + } + +\score{ + < + \type ChordNames \scales + \type Staff < \scales \keys > + > +} diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly new file mode 100644 index 0000000000..37e0ae9ef6 --- /dev/null +++ b/input/test/chord-table.ly @@ -0,0 +1,44 @@ +\header{ +filename = "chord-table.ly"; +copyright = "public domain"; +enteredby = "jcn"; +} + +tab = \notes\transpose c'''\chords{ + c1 c-m c-4 c-m4 c-5+ c-5- c-m5- c-5-5+ c-6\break %c-m6\break + % Han-Wen: try this instead, and Wierd Things (spacing etc) happen: +% \notes {} c1-m c-4 c-m4 c-5+ c-5- c-m5- c-5-5+ c-6 c-m6\break +} + +\score{ + \type StaffGroup < + \type Staff=c \notes\transpose c\tab + \type ChordNames=c \notes\transpose c\tab + \type Staff=cis \notes\transpose cis\tab + \type ChordNames=cis \notes\transpose cis\tab + \type Staff=des \notes\transpose des\tab + \type ChordNames=des \notes\transpose des\tab + \type Staff=d \notes\transpose d\tab + \type ChordNames=d \notes\transpose d\tab + \type Staff=es \notes\transpose es\tab + \type ChordNames=es \notes\transpose es\tab + \type Staff=e \notes\transpose e\tab + \type ChordNames=e \notes\transpose e\tab + \type Staff=fis \notes\transpose fis\tab + \type ChordNames=fis \notes\transpose fis\tab + \type Staff=g \notes\transpose g\tab + \type ChordNames=g \notes\transpose g\tab + \type Staff=as \notes\transpose as\tab + \type ChordNames=as \notes\transpose as\tab + \type Staff=a \notes\transpose a\tab + \type ChordNames=a \notes\transpose a\tab + \type Staff=bes \notes\transpose bes,\tab + \type ChordNames=bes \notes\transpose bes,\tab + \type Staff=b \notes\transpose b,\tab + \type ChordNames=b \notes\transpose b,\tab + > + \paper{ + textheight = \vsize - 4.0 * \staffheight; + } + +} diff --git a/input/test/chords.ly b/input/test/chords.ly index e3c0c4d182..6f46d04336 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -3,27 +3,49 @@ %{ Would this be acceptable/good enough/convenient for entry? - Convention/Standard Logical/Lily(?) + Convention/Standard Lily C# cis Cb ces - Cm/Cmin c3- - Caug c5+ - Cdim c5- - Cmaj7 c7 - C7 c7- - Csus/Csus4 c4^3 + Cm; Cmin c-3-; c-m; c-min + Caug c-5+; c-aug; + Cdim c-5-; c-dim + Cmaj7 c-7+; c-maj + C7 c-7 + Csus; Csus4 c-4; c-sus %} scales = \notes\transpose c''\chords{ - *c *g *d *a *e *b *fis - *c *f *bes *es *as *des *ges - *c6 *c7 *c9 *c11 *c13 + % + c1-m c-min c4-dim c-aug c-sus c-maj + c1-6 c4-7 c-9 c-11 c-13 + c1 g d a e b fis + c1 f bes es as des ges + } + +keys = \notes{ + s1 + s1 s1 s1 + s1 s1 + s1 + \key g; s1 + \key d; s1 + \key a; s1 + \key e; s1 + \key b; s1 + \key fis; s1 + \key c; s1 + \key f; s1 + \key bes; s1 + \key es; s1 + \key as; s1 + \key des; s1 + \key ges; s1 } \score{ < \type ChordNames \scales - \type Staff \scales + \type Staff < \scales \keys > > } diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index 70dc4623c8..91e51c635b 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -25,49 +25,50 @@ bool busy_parsing(); void kill_lexer(); void set_lexer(); - /// lexer for Mudela -class My_lily_lexer : public Includable_lexer { - int lookup_keyword (String); - int scan_bare_word (String); - int scan_escaped_word (String); - - char escaped_char(char) const; +class My_lily_lexer : public Includable_lexer +{ public: String main_input_str_; void * lexval_l; Scope * toplevel_scope_p_; bool main_input_b_; - + + Notename_table *chordmodifier_tab_p_; Notename_table *note_tab_p_; Array scope_l_arr_; Keyword_table * keytable_p_; int errorlevel_i_; - Notename_table *chordmodifier_tab_p_; - Musical_pitch lookup_notename (String s); + + My_lily_lexer (); + ~My_lily_lexer (); + int yylex (); + void start_main_input (); - void set_notename_table(Notename_table*tab_p); + bool notename_b (String) const; bool chordmodifier_b (String) const; void set_chordmodifier_table (Notename_table*tab_p); - Musical_pitch lookup_chordmodifier (String s); - - bool notename_b(String) const; + void set_notename_table (Notename_table*tab_p); Identifier*lookup_identifier (String s); - Musical_pitch lookup_pitch (String s); + Musical_pitch lookup_notename (String s); + Musical_pitch lookup_chordmodifier (String s); void push_note_state(); void push_chord_state(); void push_lyric_state(); void pop_state(); void LexerError (char const *); - My_lily_lexer(); void set_identifier (String str, Identifier* i, bool unique_b = true); - ~My_lily_lexer(); - int yylex(); void print_declarations (bool init_b) const; - void add_notename (String, Musical_pitch); bool note_state_b() const; bool chord_state_b() const; bool lyric_state_b() const; + +private: + int lookup_keyword (String); + int scan_bare_word (String); + int scan_escaped_word (String); + + char escaped_char(char) const; }; #endif diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 02b6f9a5e5..a36afe5832 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -14,7 +14,7 @@ Output: DVI file """ name = 'ly2dvi' -version = '0.0.6' +version = '0.0.7' errorlog = '' import sys @@ -422,7 +422,9 @@ class Properties: else: p=os.path.split(sys.argv[0]) p=os.path.split(p[0]) - this.setRoot(p[0],'init') + # bit silly. for ly2dvi, overrules compiled-in datadir... + # how to do this better (without running lily, of course? + this.setRoot(p[0] + '/share/lilypond', 'init') if not os.environ.has_key('HOME'): if os.environ.has_key('HOMEDRIVE') and \ diff --git a/stepmake/NEWS b/stepmake/NEWS index 61039414f6..9e81e29102 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,6 @@ +pl 61 + - bf: package-diff + pl 60 - small fixes. diff --git a/stepmake/VERSION b/stepmake/VERSION index e24ec2af87..c08a52b25d 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=59 +PATCH_LEVEL=61 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index 4bf347e9aa..79f7da48c0 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -17,11 +17,7 @@ deb: dpkg-buildpackage -b; \ )' -# urg urg -# this one works for unix (try 'make diff help==' or 'make diff release==') -makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%))) -# and this one for nt -# makeflags=$(patsubst %==, %, $(patsubst %----,%,$($(MAKEFLAGS:%=--%):--unix%=%))) +makeflags=$(patsubst %==, %, $(patsubst ----%,,$(MAKEFLAGS:%=--%))) diff: $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags)