X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=c57e18353a568dc34d9b6bccf3037b6c3a933878;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3ff7f4a235d20fe6879a1f59b7f774997fc8d813;hpb=efaf6bd61c89103205039c82fbcfc4d9ab1bb55e;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 3ff7f4a235..c57e18353a 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,133 +1,184 @@ -/* - music-sequence.cc -- implement Music_sequence - +/* + music-sequence.cc -- implement Music_sequence + source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ -#include "music-list.hh" -#include "debug.hh" -#include "musical-pitch.hh" + (c) 1998--2008 Han-Wen Nienhuys +*/ + +#include "music-sequence.hh" + +#include "warn.hh" +#include "program-option.hh" +#include "music.hh" +#include "input.hh" void -Music_sequence::truncate (int k) +transpose_music_list (SCM lst, Pitch rq) { - SCM l = get_mus_property ("list"); - if (k == 0) + for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->transpose (rq); +} + +Moment +Music_sequence::cumulative_length (SCM l) +{ + Moment cumulative; + Moment last_len; + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - l = SCM_EOL; + Moment l = unsmob_music (scm_car (s))->get_length (); + if (last_len.grace_part_ && l.main_part_) + last_len.grace_part_ = Rational (0); + cumulative += last_len; + last_len = l; } - else - { - SCM s = l; - k--; - for (; gh_pair_p (s) && k--; s = gh_cdr (s)) - ; - if (gh_pair_p (s)) + last_len.grace_part_ = Rational (0); + cumulative += last_len; + + return cumulative; +} + +Moment +Music_sequence::maximum_length (SCM l) +{ + Moment dur = 0; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + Music *m = unsmob_music (scm_car (s)); + if (!m) + programming_error ("Music sequence should have music elements"); + else { - gh_set_cdr_x (s, SCM_EOL); + Moment l = m->get_length (); + dur = max (dur, l); } } - set_mus_property ("list", l); + + return dur; } +MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1); SCM -Music_sequence::music_list ()const +Music_sequence::maximum_length_callback (SCM m) { - return get_mus_property ("list"); + Music *me = unsmob_music (m); + return maximum_length (me->get_property ("elements")).smobbed_copy (); } -/* - Ugh this sucks. Linear. do not use. - */ -void -Music_sequence::append_music (Music *m) +MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1); +SCM +Music_sequence::cumulative_length_callback (SCM m) { - set_mus_property ("list", - gh_append2( music_list(), gh_cons (m->self_scm (), SCM_EOL))); - scm_unprotect_object (m->self_scm ()); + Music *me = unsmob_music (m); + return cumulative_length (me->get_property ("elements")).smobbed_copy (); } -Music_sequence::Music_sequence(SCM h) +MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1); +SCM +Music_sequence::minimum_start_callback (SCM m) { - set_mus_property ("list", h); + Music *me = unsmob_music (m); + return minimum_start (me->get_property ("elements")).smobbed_copy (); } -void -Music_sequence::transpose (Musical_pitch rq) +MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1); +SCM +Music_sequence::first_start_callback (SCM m) { - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->transpose (rq); + Music *me = unsmob_music (m); + return first_start (me->get_property ("elements")).smobbed_copy (); } -void -Music_sequence::do_print() const +Pitch +music_list_to_relative (SCM l, Pitch p, bool ret_first) { -#ifndef NPRINT - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->print(); -#endif -} - + Pitch first = p; + int count = 0; + Pitch last = p; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + if (Music *m = unsmob_music (scm_car (s))) + { + last = m->to_relative_octave (last); + if (!count++) + first = last; + } + } -Moment -Music_sequence::cumulative_length () const -{ - Moment last=0; - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - last += unsmob_music (gh_car (s))->length_mom (); - return last; + return (ret_first) ? first : last; } -Musical_pitch -Music_sequence::to_relative_octave (Musical_pitch p) +void +compress_music_list (SCM l, Moment m) { - return do_relative_octave (p, false); + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->compress (m); } - Moment -Music_sequence::maximum_length () const +Music_sequence::minimum_start (SCM l) { - Moment dur = 0; - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - dur = dur >? unsmob_music (gh_car (s))->length_mom (); + Moment m; - return dur; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + m = min (m, unsmob_music (scm_car (s))->start_mom ()); + return m; } -int -Music_sequence::length_i () const + +Moment +Music_sequence::first_start (SCM l) { - return scm_ilength (music_list ()); + Moment m; + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + Music *mus = unsmob_music (scm_car (s)); + Moment l = mus->get_length (); + Moment s = mus->start_mom (); + if (l.to_bool () || s.to_bool ()) + return s; + } + return m; } -Musical_pitch -Music_sequence::do_relative_octave (Musical_pitch p, bool ret_first) +MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); +SCM +Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) { - Musical_pitch retval; - int count=0; + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + + SCM elts = me->get_property ("elements"); + SCM copied = SCM_EOL; + if (lily_1_8_relative) + copied = ly_music_deep_copy (elts); - Musical_pitch last = p; - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) + Pitch retval = music_list_to_relative (elts, p, false); + + if (lily_1_8_relative) { - last = unsmob_music (gh_car (s))->to_relative_octave (last); - if (!count ++ ) - retval = last; + + Pitch retval_1_8 = music_list_to_relative (copied, p, true); + if (retval_1_8 != retval) + lily_1_8_compatibility_used = true; + + retval = retval_1_8; } - if (!ret_first) - retval = last; - - return retval; + return retval.smobbed_copy (); } -void -Music_sequence::compress (Moment m) +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); +SCM +Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) { - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->compress (m); + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, true).smobbed_copy (); } +