X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=666b1fbf1dee6bccb2976ddd4c48e73e13ff23a1;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=665b00e1c6cc1b6b76ecd45341aada4082201555;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 665b00e1c6..666b1fbf1d 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,90 +1,78 @@ -/* - repeated-music.cc -- implement Repeated_music - +/* + repeated-music.cc -- implement Repeated_music + source file of the GNU LilyPond music typesetter - - (c) 1999--2001 Han-Wen Nienhuys - - */ + + (c) 1999--2007 Han-Wen Nienhuys +*/ #include "repeated-music.hh" -#include "music-list.hh" +#include "music-sequence.hh" #include "pitch.hh" -#include "debug.hh" +#include "warn.hh" +#include "program-option.hh" Music * -Repeated_music::body ()const +Repeated_music::body (Music *me) { - return unsmob_music (get_mus_property ("body")); + return unsmob_music (me->get_property ("element")); } -Music_sequence* -Repeated_music::alternatives ()const -{ - return dynamic_cast (unsmob_music (get_mus_property ("alternatives"))); -} - -Repeated_music::Repeated_music(SCM l) - : Music (l) -{ - set_mus_property ("type", ly_symbol2scm ("repeated-music")); -} - - -Pitch -Repeated_music::to_relative_octave (Pitch p) +SCM +Repeated_music::alternatives (Music *me) { - 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); - - - return last; + return me->get_property ("elements"); } -void -Repeated_music::transpose (Pitch p) +MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2); +SCM +Repeated_music::relative_callback (SCM music, SCM pitch) { - if (body ()) - body ()->transpose (p); + Pitch p = *unsmob_pitch (pitch); + Music *me = unsmob_music (music); + if (lily_1_8_relative) + { + Music *body = unsmob_music (me->get_property ("element")); + if (body) + p = body->to_relative_octave (p); - if (alternatives ()) - alternatives ()->transpose (p); -} + Pitch last = p; + SCM alternatives = me->get_property ("elements"); -void -Repeated_music::compress (Moment p) -{ - if (body ()) - body ()->compress (p); + for (SCM s = alternatives; scm_is_pair (s); s = scm_cdr (s)) + { + lily_1_8_compatibility_used = true; + unsmob_music (scm_car (s))->to_relative_octave (p); + } - if (alternatives ()) - alternatives ()->compress (p); + return last.smobbed_copy (); + } + else + return me->generic_to_relative_octave (p).smobbed_copy (); } Moment -Repeated_music::alternatives_length_mom (bool fold) const +Repeated_music::alternatives_get_length (Music *me, bool fold) { - if (!alternatives () ) + SCM alternative_list = alternatives (me); + int len = scm_ilength (alternative_list); + if (len <= 0) return 0; - - if (fold) - return alternatives ()->maximum_length (); - Moment m =0; - int done =0; + if (fold) + return Music_sequence::maximum_length (alternative_list); + + Moment m = 0; + int done = 0; + int count = robust_scm2int (me->get_property ("repeat-count"), 0); - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p) && done < repeat_count ()) + SCM p = alternative_list; + while (scm_is_pair (p) && done < count) { - m = m + unsmob_music (gh_car (p))->length_mom (); - done ++; - if (repeat_count () - done < alternatives ()->length_i ()) - p = gh_cdr (p); + m = m + unsmob_music (scm_car (p))->get_length (); + done++; + if (count - done < len) + p = scm_cdr (p); } return m; } @@ -94,65 +82,81 @@ Repeated_music::alternatives_length_mom (bool fold) const of volta repeats, where the alternatives are iterated just as they were entered. */ Moment -Repeated_music::alternatives_volta_length_mom () const +Repeated_music::alternatives_volta_get_length (Music *me) { - if (!alternatives ()) - return 0; - - Moment m; - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p)) - { - m = m + unsmob_music (gh_car (p))->length_mom (); - p = gh_cdr (p); - } - return m; + return Music_sequence::cumulative_length (alternatives (me)); } +/* + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ Moment -Repeated_music::body_length_mom () const +Repeated_music::body_get_length (Music *me) { Moment m = 0; - if (body ()) - { - m = body ()->length_mom (); - } + if (Music *body = unsmob_music (me->get_property ("element"))) + m = body->get_length (); return m; } -int -Repeated_music::repeat_count () const -{ - return gh_scm2int (get_mus_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); 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); + Music *me = unsmob_music (m); + + Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false); return l.smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); SCM 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); + Music *me = unsmob_music (m); + + Moment l = body_get_length (me) + alternatives_get_length (me, true); return l.smobbed_copy (); } +int +Repeated_music::repeat_count (Music *me) +{ + return scm_to_int (me->get_property ("repeat-count")); +} + +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); SCM Repeated_music::volta_music_length (SCM m) { - Repeated_music* r = dynamic_cast (unsmob_music (m)); - Moment l = r->body_length_mom () + r->alternatives_volta_length_mom (); + Music *me = unsmob_music (m); + Moment l = body_get_length (me) + alternatives_volta_get_length (me); return l.smobbed_copy (); } + +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 (); +}