X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=daf7611a70451d0ce3129db8daa93b94f1c19984;hb=28976d28a04cfb9abe97af7214d7dce11f732604;hp=82d1c9fe9c63e6294374d9fb1d2f49b258db773c;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 82d1c9fe9c..daf7611a70 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -3,135 +3,186 @@ 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 "musical-pitch.hh" -#include "debug.hh" +#include "pitch.hh" +#include "warn.hh" +#include "music-sequence.hh" +#include "scm-option.hh" -Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts) +Music * +Repeated_music::body ()const { - repeat_body_p_ = beg; - fold_b_ = false; - repeats_i_ = times; - alternatives_p_ = alts; - volta_fold_b_ = true; - if (alts) - alts->music_p_list_p_->truncate (times); + return unsmob_music (get_property ("element")); } -Repeated_music::Repeated_music (Repeated_music const &s) - : Music (s) +SCM +Repeated_music::alternatives ()const { - repeats_i_ = s.repeats_i_; - fold_b_ = s.fold_b_; - volta_fold_b_ = s.volta_fold_b_; - type_ = s.type_; - repeat_body_p_ = s.repeat_body_p_ ? s.repeat_body_p_->clone () : 0; - alternatives_p_ = s.alternatives_p_ - ? dynamic_cast (s.alternatives_p_->clone ()):0; + return get_property ("elements"); } -Repeated_music::~Repeated_music () -{ - delete repeat_body_p_; - delete alternatives_p_; -} -void -Repeated_music::do_print () const -{ -#ifndef NPRINT - DEBUG_OUT << "Fold = " << fold_b_ << " reps: " << repeats_i_; - if (repeat_body_p_) - repeat_body_p_->print(); - - if (alternatives_p_) - alternatives_p_->print(); -#endif -} -Musical_pitch -Repeated_music::to_relative_octave (Musical_pitch p) +Pitch +Repeated_music::to_relative_octave (Pitch p) { - if (repeat_body_p_) - p = repeat_body_p_->to_relative_octave (p); - - Musical_pitch last = p ; - if (alternatives_p_) - for (Cons *i = alternatives_p_->music_p_list_p_->head_; i ; i = i->next_) - { - last = i->car_->to_relative_octave (p); - } - - return last; -} - + if (lily_1_8_relative) + { + if (body ()) + p = body ()->to_relative_octave (p); + Pitch last = p ; + if (alternatives ()) + { + lily_1_8_compatibility_used = true; -void -Repeated_music::transpose (Musical_pitch p) -{ - if (repeat_body_p_) - repeat_body_p_->transpose (p); + for (SCM s = alternatives (); is_pair (s); s = ly_cdr (s)) + unsmob_music (ly_car (s))->to_relative_octave (p); + } - if (alternatives_p_) - alternatives_p_->transpose (p); + return last; + } + else + { + return Music::to_relative_octave (p); + } } -void -Repeated_music::compress (Moment p) -{ - if (repeat_body_p_) - repeat_body_p_->compress (p); - - if (alternatives_p_) - alternatives_p_->compress (p); -} Moment -Repeated_music::alternatives_length_mom () const +Repeated_music::alternatives_get_length (bool fold) const { - if (!alternatives_p_ ) + if (!alternatives ()) return 0; - if (fold_b_) - return alternatives_p_->maximum_length (); + if (fold) + return Music_sequence::maximum_length (alternatives ()); Moment m =0; int done =0; - Cons *p = alternatives_p_->music_p_list_p_->head_; - while (p && done < repeats_i_) + + SCM p = alternatives (); + while (is_pair (p) && done < repeat_count ()) { - m = m + p->car_->length_mom (); + m = m + unsmob_music (ly_car (p))->get_length (); done ++; - if (volta_fold_b_ - || repeats_i_ - done < alternatives_p_->length_i ()) - p = p->next_; + if (repeat_count () - done < scm_ilength (alternatives ())) + p = ly_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 { - Moment m = 0; - if (repeat_body_p_) + if (!alternatives ()) + return 0; + + Moment m; + SCM p = alternatives (); + while (is_pair (p)) { - m = repeat_body_p_->length_mom (); - if (!fold_b_ && !volta_fold_b_) - m *= Rational (repeats_i_); + m = m + unsmob_music (ly_car (p))->get_length (); + p = ly_cdr (p); } return m; } + +/* + Length of the body in THIS. Disregards REPEAT-COUNT. + */ Moment -Repeated_music::length_mom () const +Repeated_music::body_get_length () const +{ + Moment m = 0; + if (body ()) + { + m = body ()->get_length (); + } + return m; +} + +int +Repeated_music::repeat_count () const +{ + return ly_scm2int (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); + +SCM +Repeated_music::unfolded_music_length (SCM m) { - return body_length_mom () + alternatives_length_mom (); + Repeated_music* r = dynamic_cast (unsmob_music (m)); + + Moment l = Moment (r->repeat_count ()) * r->body_get_length () + r->alternatives_get_length (false); + return l.smobbed_copy (); } +SCM +Repeated_music::folded_music_length (SCM m) +{ + Repeated_music* r = dynamic_cast (unsmob_music (m)); + + Moment l = r->body_get_length () + r->alternatives_get_length (true); + return l.smobbed_copy (); +} + +SCM +Repeated_music::volta_music_length (SCM m) +{ + Repeated_music* r = dynamic_cast (unsmob_music (m)); + Moment l = r->body_get_length () + r->alternatives_volta_get_length (); + return l.smobbed_copy (); +} + +ADD_MUSIC (Repeated_music); + +Repeated_music::Repeated_music () + : Music () +{ +} + + +MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1); +MAKE_SCHEME_CALLBACK (Repeated_music,first_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 (); + } +} + +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 (); +}