X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=90764d987e72cbcd7e020266dc18e7368466e600;hb=1a112025ae1b44da63bfaf8c68c1b9d1b0da0bd4;hp=9ff853a9a64bb443cddec9076bf9c80dc18fafa6;hpb=1161a2b71bc32575ea9878a8631221edb8c03279;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 9ff853a9a6..90764d987e 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -3,99 +3,109 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys */ #include "repeated-music.hh" + #include "music-list.hh" #include "pitch.hh" -#include "debug.hh" +#include "warn.hh" +#include "scm-option.hh" Music * Repeated_music::body ()const { - return unsmob_music (get_mus_property ("body")); + return unsmob_music (get_property ("element")); } -Music_sequence* +SCM Repeated_music::alternatives ()const { - return dynamic_cast (unsmob_music (get_mus_property ("alternatives"))); + return get_property ("elements"); } -Repeated_music::Repeated_music(SCM l) - : Music (l) -{ - set_mus_property ("type", ly_symbol2scm ("repeated-music")); -} - - Pitch Repeated_music::to_relative_octave (Pitch p) { - if (body ()) - p = body ()->to_relative_octave (p); - - Pitch last = p ; - if (alternatives ()) - for (SCM s = alternatives ()->music_list (); gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->to_relative_octave (p); - + if (lily_1_8_relative) + { + if (body ()) + p = body ()->to_relative_octave (p); - return last; -} + Pitch last = p ; + if (alternatives ()) + { + lily_1_8_compatibility_used = true; -void -Repeated_music::transpose (Pitch p) -{ - if (body ()) - body ()->transpose (p); + for (SCM s = alternatives (); scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->to_relative_octave (p); + } - if (alternatives ()) - alternatives ()->transpose (p); + return last; + } + else + { + return Music::to_relative_octave (p); + } } -void -Repeated_music::compress (Moment p) -{ - if (body ()) - body ()->compress (p); - - if (alternatives ()) - alternatives ()->compress (p); -} Moment -Repeated_music::alternatives_length_mom (bool fold) const +Repeated_music::alternatives_get_length (bool fold) const { - if (!alternatives () ) + if (!alternatives ()) return 0; - if (fold) - return alternatives ()->maximum_length (); + if (fold) + return Music_sequence::maximum_length (alternatives ()); - Moment m =0; - int done =0; + Moment m = 0; + int done = 0; - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p) && done < repeat_count ()) + SCM p = alternatives (); + while (scm_is_pair (p) && done < repeat_count ()) { - m = m + unsmob_music (gh_car (p))->length_mom (); + m = m + unsmob_music (scm_car (p))->get_length (); done ++; - if (repeat_count () - done < alternatives ()->length_i ()) - p = gh_cdr (p); + if (repeat_count () - done < scm_ilength (alternatives ())) + p = scm_cdr (p); } return m; } +/* + Sum all duration of all available alternatives. This is for the case + of volta repeats, where the alternatives are iterated just as they + were entered. */ Moment -Repeated_music::body_length_mom () const +Repeated_music::alternatives_volta_get_length () const +{ + if (!alternatives ()) + return 0; + + Moment m; + SCM p = alternatives (); + while (scm_is_pair (p)) + { + m = m + unsmob_music (scm_car (p))->get_length (); + p = scm_cdr (p); + } + return m; +} + + +/* + Length of the body in THIS. Disregards REPEAT-COUNT. + */ +Moment +Repeated_music::body_get_length () const { Moment m = 0; if (body ()) { - m = body ()->length_mom (); + m = body ()->get_length (); } return m; } @@ -103,20 +113,20 @@ Repeated_music::body_length_mom () const int Repeated_music::repeat_count () const { - return gh_scm2int (get_mus_property ("repeat-count")); + return scm_to_int (get_property ("repeat-count")); } -MAKE_SCHEME_CALLBACK(Repeated_music,unfolded_music_length, 1); -MAKE_SCHEME_CALLBACK(Repeated_music,folded_music_length, 1); -MAKE_SCHEME_CALLBACK(Repeated_music,volta_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music,unfolded_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music,folded_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music,volta_music_length, 1); SCM Repeated_music::unfolded_music_length (SCM m) { Repeated_music* r = dynamic_cast (unsmob_music (m)); - Moment l = Moment (r->repeat_count ()) * r->body_length_mom () + r->alternatives_length_mom (false); + Moment l = Moment (r->repeat_count ()) * r->body_get_length () + r->alternatives_get_length (false); return l.smobbed_copy (); } @@ -125,7 +135,7 @@ Repeated_music::folded_music_length (SCM m) { Repeated_music* r = dynamic_cast (unsmob_music (m)); - Moment l = r->body_length_mom () + r->alternatives_length_mom (true); + Moment l = r->body_get_length () + r->alternatives_get_length (true); return l.smobbed_copy (); } @@ -133,6 +143,42 @@ SCM Repeated_music::volta_music_length (SCM m) { Repeated_music* r = dynamic_cast (unsmob_music (m)); - Moment l = r->body_length_mom () + r->alternatives_length_mom (false); + Moment l = r->body_get_length () + r->alternatives_volta_get_length (); return l.smobbed_copy (); } + +ADD_MUSIC (Repeated_music); + +Repeated_music::Repeated_music (SCM x) + : Music (x) +{ +} + + +MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1); +SCM +Repeated_music::minimum_start (SCM m) +{ + Music * me = unsmob_music (m); + Music * body = unsmob_music (me->get_property ("element")); + + if (body) + return body->start_mom ().smobbed_copy (); + else + { + return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy (); + } +} + +MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1); +SCM +Repeated_music::first_start (SCM m) +{ + Music * me = unsmob_music (m); + Music * body = unsmob_music (me->get_property ("element")); + + Moment rv = (body) ? body->start_mom () : + Music_sequence::first_start (me->get_property ("elements")); + + return rv.smobbed_copy (); +}