X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=8a2915ad10c8d2c4bbbb54124b3f4d08f42708bb;hb=4f80bf5bb55aa64f2e1c0c1588d8784627c73a21;hp=7ce0568bb142d3a496eb881c0a7fc53837c050e2;hpb=d922345d76f194d51a9e0ac00a491034223bbea0;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 7ce0568bb1..8a2915ad10 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,13 +1,13 @@ -/* - music-sequence.cc -- implement Music_sequence - +/* + music-sequence.cc -- implement Music_sequence + source file of the GNU LilyPond music typesetter - - (c) 1998--2005 Han-Wen Nienhuys + + (c) 1998--2006 Han-Wen Nienhuys */ #include "warn.hh" -#include "scm-option.hh" +#include "program-option.hh" #include "pitch.hh" #include "input.hh" #include "music-sequence.hh" @@ -15,23 +15,21 @@ void transpose_music_list (SCM lst, Pitch rq) { - for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) - unsmob_music (scm_car (s))->transpose (rq); + 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) +Music_sequence::cumulative_length (SCM l) { Moment cumulative; - Moment last_len; + Moment last_len; - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { Moment l = unsmob_music (scm_car (s))->get_length (); if (last_len.grace_part_ && l.main_part_) - { - last_len.grace_part_ = Rational (0); - } + last_len.grace_part_ = Rational (0); cumulative += last_len; last_len = l; } @@ -39,54 +37,58 @@ Music_sequence::cumulative_length (SCM l) last_len.grace_part_ = Rational (0); cumulative += last_len; - return cumulative; + return cumulative; } Moment Music_sequence::maximum_length (SCM l) { Moment dur = 0; - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music * m = unsmob_music (scm_car (s)); - Moment l = m->get_length (); - dur = dur >? l; + Music *m = unsmob_music (scm_car (s)); + if (!m) + programming_error ("Music sequence should have music elements"); + else + { + Moment l = m->get_length (); + dur = max (dur, l); + } } return dur; } -MAKE_SCHEME_CALLBACK(Music_sequence, maximum_length_callback, 1); +MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1); SCM Music_sequence::maximum_length_callback (SCM m) { - Music* me = unsmob_music (m); - return maximum_length (me->get_property ("elements")).smobbed_copy(); + Music *me = unsmob_music (m); + return maximum_length (me->get_property ("elements")).smobbed_copy (); } -MAKE_SCHEME_CALLBACK(Music_sequence, cumulative_length_callback, 1); +MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1); SCM Music_sequence::cumulative_length_callback (SCM m) { - Music* me = unsmob_music (m); - return cumulative_length (me->get_property ("elements")).smobbed_copy(); + Music *me = unsmob_music (m); + return cumulative_length (me->get_property ("elements")).smobbed_copy (); } - -MAKE_SCHEME_CALLBACK(Music_sequence, minimum_start_callback, 1); +MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1); SCM Music_sequence::minimum_start_callback (SCM m) { - Music* me = unsmob_music (m); - return minimum_start (me->get_property ("elements")).smobbed_copy(); + Music *me = unsmob_music (m); + return minimum_start (me->get_property ("elements")).smobbed_copy (); } -MAKE_SCHEME_CALLBACK(Music_sequence, first_start_callback, 1); +MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1); SCM Music_sequence::first_start_callback (SCM m) { - Music* me = unsmob_music (m); - return first_start (me->get_property ("elements")).smobbed_copy(); + Music *me = unsmob_music (m); + return first_start (me->get_property ("elements")).smobbed_copy (); } Pitch @@ -96,12 +98,12 @@ music_list_to_relative (SCM l, Pitch p, bool ret_first) int count = 0; Pitch last = p; - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + 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 ++) + if (!count++) first = last; } } @@ -109,11 +111,10 @@ music_list_to_relative (SCM l, Pitch p, bool ret_first) return (ret_first) ? first : last; } - void compress_music_list (SCM l, Moment m) { - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) unsmob_music (scm_car (s))->compress (m); } @@ -121,22 +122,20 @@ Moment Music_sequence::minimum_start (SCM l) { Moment m; - - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) - { - m = m start_mom (); - } + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + m = min (m, unsmob_music (scm_car (s))->start_mom ()); return m; } Moment -Music_sequence::first_start (SCM l) +Music_sequence::first_start (SCM l) { Moment m; - - for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music * mus = unsmob_music (scm_car (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 ()) @@ -145,7 +144,7 @@ Music_sequence::first_start (SCM l) return m; } -MAKE_SCHEME_CALLBACK(Music_sequence, simultaneous_relative_callback, 2); +MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); SCM Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) { @@ -158,10 +157,10 @@ Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) copied = ly_music_deep_copy (elts); Pitch retval = music_list_to_relative (elts, p, false); - + if (lily_1_8_relative) { - + Pitch retval_1_8 = music_list_to_relative (copied, p, true); if (retval_1_8 != retval) lily_1_8_compatibility_used = true; @@ -172,8 +171,7 @@ Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) return retval.smobbed_copy (); } - -MAKE_SCHEME_CALLBACK(Music_sequence, event_chord_relative_callback, 2); +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); SCM Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) { @@ -182,4 +180,4 @@ Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) return music_list_to_relative (me->get_property ("elements"), p, true).smobbed_copy (); } - +