From: hanwen Date: Fri, 16 Jan 2004 13:08:11 +0000 (+0000) Subject: * lily/system.cc (output_lines): revert uniquify_list() patch, X-Git-Tag: release/2.1.10~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=95dcf258fa34192177de1931a10be235d485bb7d;p=lilypond.git * lily/system.cc (output_lines): revert uniquify_list() patch, strange side effects seen. * lily/line-spanner.cc (dashed_line_molecule): return nothing if dash-period < 0. --- diff --git a/ChangeLog b/ChangeLog index 2b5848984e..a4aa798f51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-01-16 Han-Wen Nienhuys + * lily/system.cc (output_lines): revert uniquify_list() patch, + strange side effects seen. + + * lily/line-spanner.cc (dashed_line_molecule): return nothing if + dash-period < 0. + * scm/midi.scm (instrument-equalizer-alist): fix equalizer setting for flute. diff --git a/VERSION b/VERSION index 9f53de19ed..f7a5644825 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=1 -PATCH_LEVEL=9 -MY_PATCH_LEVEL=hwn1 +PATCH_LEVEL=10 +MY_PATCH_LEVEL= diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly index 99c5bcb5bc..d8f1ea7011 100644 --- a/input/template/melody-lyrics-chords.ly +++ b/input/template/melody-lyrics-chords.ly @@ -1,30 +1,30 @@ \version "2.1.7" - -\header { - texidoc = "Popsong format: chords, melody and lyrics." +\header +{ + texidoc = "Popsong format: chords, melody and lyrics." } -melody = \notes \relative c' { - a b c d +melody = \notes \relative c' +{ + a b c d } text = \lyrics { - Aaa Bee Cee Dee + Aaa Bee Cee Dee } accompaniment = \chords { - a2 c2 + a2 c2 } \score { << \context ChordNames \accompaniment - \addlyrics - \context Staff = one { - \autoBeamOff + \context Voice = one { + \autoBeamOff \melody - } - \context Lyrics \text + } + \newaddlyrics "one" \new LyricsVoice \text >> \paper { } \midi { } diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 9d879732bb..05c7d0e1e8 100644 --- a/input/template/melody-lyrics.ly +++ b/input/template/melody-lyrics.ly @@ -14,12 +14,11 @@ text = \lyrics { \score { << - \addlyrics - \context Staff = one { - \property Staff.autoBeaming = ##f - \melody + \context Voice = one { + \property Staff.autoBeaming = ##f + \melody } - \context Lyrics \text + \newaddlyrics \new Lyrics \text >> \paper { } \midi { } diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index cd84ccfcd9..b4e757ed8e 100644 --- a/input/template/piano-lyrics.ly +++ b/input/template/piano-lyrics.ly @@ -18,9 +18,10 @@ text = \lyrics { \score { \context GrandStaff << - \addlyrics - \context Staff = upper \upper - \context Lyrics \text + \context Staff = upper { + \context Voice = singer \upper + } + \newaddlyrics "singer" \new LyricsVoice \text \context Staff = lower << \clef bass \lower diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index 5870d37ea3..d12b369614 100644 --- a/input/template/piano-melody-lyrics.ly +++ b/input/template/piano-melody-lyrics.ly @@ -23,23 +23,22 @@ lower = \notes\relative c { \score { << - \addlyrics - \context Staff = mel { - \autoBeamOff - \melody + \context Voice = mel { + \autoBeamOff + \melody } - \context Lyrics \text + \newaddlyrics mel \new LyricsVoice \text - \context PianoStaff << - \context Staff = upper \upper - \context Staff = lower << - \clef bass - \lower + \context PianoStaff << + \context Staff = upper \upper + \context Staff = lower << + \clef bass + \lower + >> >> - >> >> \paper { - \translator { \RemoveEmptyStaffContext } + \translator { \RemoveEmptyStaffContext } } \midi { } } diff --git a/input/template/satb.ly b/input/template/satb.ly index 96c216288b..beb970281c 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -20,24 +20,25 @@ bassWords = \lyrics { ho4 ho ho ho } \score { \notes \context StaffGroup << - \context Lyrics = sopLyrs { s1 } - \context Staff = women { s1 } - \context Lyrics = altoLyrs { s1 } - \context Lyrics = tenorLyrs { s1 } - \context Staff = men {\clef bass s1 } - \context Lyrics = bassLyrs { s1 } - \addlyrics - \context Staff = women \context Voice = VA { \voiceOne \sopMusic } - \context Lyrics = sopLyrs { \sopWords} - \addlyrics - \context Staff = women \context Voice = VB { \voiceTwo \altoMusic } - \context Lyrics = altoLyrs { \altoWords} - \addlyrics - \context Staff = men \context Voice = VA { \voiceOne \tenorMusic } - \context Lyrics = tenorLyrs { \tenorWords} - \addlyrics - \context Staff = men \context Voice = VB { \voiceTwo \bassMusic } - \context Lyrics = bassLyrs { \bassWords} + \context LyricsVoice = sopranos { s1 } + \context Staff = women << + \context Voice = sopranos { \voiceOne \sopMusic } + \context Voice = altos { \voiceTwo \altoMusic } + >> + \context LyricsVoice = altos { s1 } + \context LyricsVoice = tenors { s1 } + \context Staff = men << + \clef bass + \context Voice = tenors { \voiceOne \tenorMusic } + \context Voice = basses { \voiceTwo \bassMusic } + >> + \context LyricsVoice = basses { s1 } + + + \context LyricsVoice = sopranos \newaddlyrics sopranos \sopWords + \context LyricsVoice = altos \newaddlyrics altos \altoWords + \context LyricsVoice = tenors \newaddlyrics tenors \tenorWords + \context LyricsVoice = basses \newaddlyrics basses \bassWords >> \paper { diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index ba96f5dcfd..c47196d1f5 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -45,6 +45,7 @@ dashed_line_molecule (Grob *me, Real thick, Offset from, Offset to) SCM s = me->get_grob_property ("dash-fraction"); if (gh_number_p (s)) fraction = gh_scm2double (s); + fraction = (fraction >? 0) daddy_trans_) t = t->daddy_trans_; - - Translator_group* voice = find_context_below (t, "Voice", ly_scm2string (voice_name)); + + String name = ly_scm2string (voice_name); + Translator_group* voice = find_context_below (t, "Voice", name); Translator_group *thread = 0; if (voice) thread = find_context_below (voice, "Thread", ""); + else + get_music ()->origin ()->warning (_f("Cannot find Voice: %s\n", name.to_str0())); if (thread) music_context_ = thread; - + if (lyrics_context_ && voice) lyrics_context_->set_property ("associatedVoiceContext", voice->self_scm ()); } diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index dec5000b2a..47e6977ff8 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -101,7 +101,6 @@ Staff_symbol_referencer::callback (SCM element_smob, SCM) { Grob *me = unsmob_grob (element_smob); - SCM pos = me->get_grob_property ("staff-position"); Real off =0.0; if (gh_number_p (pos)) diff --git a/lily/system.cc b/lily/system.cc index ff5239153c..ff2f5a878e 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -176,7 +176,11 @@ System::output_lines () for (int i=0; i < broken_intos_.size (); i++) { SCM al = broken_intos_[i]->get_grob_property ("all-elements"); - al = uniquify_list (al); + + /* + don't do this: strange side effects. + */ + // al = uniquify_list (al); } @@ -191,7 +195,8 @@ System::output_lines () if (verbose_global_b) progress_indication ("["); - system->post_processing (i+1 == broken_intos_.size ()); + bool last = i+1 == broken_intos_.size (); + system->post_processing (last); if (verbose_global_b) { diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index e9d4e2bc77..6549ca6c03 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -150,7 +150,8 @@ square of the inner notes involved.") (grob-property-description 'control-points list? "List of 4 offsets (number-pairs) that form control points for the tie/slur shape.") (grob-property-description 'damping integer? "amount of beam slope damping should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams .") -(grob-property-description 'dash-period number? "the length of one dash + white space.") +(grob-property-description 'dash-period number? "the length of one dash + white space. If negative, no line is drawn at all." +) (grob-property-description 'dash-fraction number? "Size of the dashes, relative to dash-period. Should be between 0.0 (no line) and 1.0 (continuous line).") (grob-property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.") (grob-property-description 'descendens boolean? "is this neume of a descendent type?.")