X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=becbbfcb5b55f6c45cf0200234fd4fcaa49d8899;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6436be9bfa7adaea4d34997cece84660e3866b0e;hpb=434da79e9d7684b2b05fa92a6d808d4ea7933046;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 6436be9bfa..becbbfcb5b 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,143 +1,162 @@ -/* - new-repeated-music.cc -- implement Repeated_music - +/* + repeated-music.cc -- implement Repeated_music + source file of the GNU LilyPond music typesetter - - (c) 1999 Han-Wen Nienhuys - - */ -#include "new-repeated-music.hh" -#include "music-list.hh" -#include "musical-pitch.hh" -#include "debug.hh" + (c) 1999--2008 Han-Wen Nienhuys +*/ -Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts) -{ - repeat_body_p_ = beg; - fold_b_ = false; - repeats_i_ = times; - alternatives_p_ = alts; - semi_fold_b_ = true; - if (alts) - alts->music_p_list_p_->truncate (times); -} +#include "repeated-music.hh" +#include "music-sequence.hh" +#include "pitch.hh" +#include "warn.hh" +#include "program-option.hh" -Repeated_music::Repeated_music (Repeated_music const &s) - : Music (s) +Music * +Repeated_music::body (Music *me) { - repeats_i_ = s.repeats_i_; - fold_b_ = s.fold_b_; - semi_fold_b_ = s.semi_fold_b_; - - 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 unsmob_music (me->get_property ("element")); } -Repeated_music::~Repeated_music () +SCM +Repeated_music::alternatives (Music *me) { - delete repeat_body_p_; - delete alternatives_p_; + return me->get_property ("elements"); } -void -Repeated_music::do_print () const +MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2); +SCM +Repeated_music::relative_callback (SCM music, SCM pitch) { -#ifndef NPRINT - DOUT << "Fold = " << fold_b_ << " reps: " << repeats_i_; - - if (repeat_body_p_) - repeat_body_p_->print(); - - if (alternatives_p_) - alternatives_p_->print(); -#endif + 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); + + Pitch last = p; + SCM alternatives = me->get_property ("elements"); + + 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); + } + + return last.smobbed_copy (); + } + else + return me->generic_to_relative_octave (p).smobbed_copy (); } -Musical_pitch -Repeated_music::to_relative_octave (Musical_pitch p) +Moment +Repeated_music::alternatives_get_length (Music *me, bool fold) { - if (repeat_body_p_) - p = repeat_body_p_->to_relative_octave (p); + SCM alternative_list = alternatives (me); + int len = scm_ilength (alternative_list); + if (len <= 0) + return 0; - if (alternatives_p_) - p = alternatives_p_->do_relative_octave (p, true); - return p; + 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 = alternative_list; + while (scm_is_pair (p) && done < count) + { + m = m + unsmob_music (scm_car (p))->get_length (); + done++; + if (count - done < len) + p = scm_cdr (p); + } + return m; } -Music_iterator* -Repeated_music::to_rhythm (Music_iterator* r) +/* + 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::alternatives_volta_get_length (Music *me) { - if (repeat_body_p_) - r = repeat_body_p_->to_rhythm (r); + return Music_sequence::cumulative_length (alternatives (me)); +} - if (alternatives_p_) - r = alternatives_p_->do_rhythm (r); - return r; +/* + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ +Moment +Repeated_music::body_get_length (Music *me) +{ + Moment m = 0; + if (Music *body = unsmob_music (me->get_property ("element"))) + m = body->get_length (); + return m; } +MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1); -void -Repeated_music::transpose (Musical_pitch p) +SCM +Repeated_music::unfolded_music_length (SCM m) { - if (repeat_body_p_) - repeat_body_p_->transpose (p); + Music *me = unsmob_music (m); - if (alternatives_p_) - alternatives_p_->transpose (p); + Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false); + return l.smobbed_copy (); } -void -Repeated_music::compress (Moment p) +MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); +SCM +Repeated_music::folded_music_length (SCM m) { - if (repeat_body_p_) - repeat_body_p_->compress (p); + Music *me = unsmob_music (m); - if (alternatives_p_) - alternatives_p_->compress (p); + Moment l = body_get_length (me) + alternatives_get_length (me, true); + return l.smobbed_copy (); } -Moment -Repeated_music::alternatives_length_mom () const +int +Repeated_music::repeat_count (Music *me) { - if (!alternatives_p_ ) - return 0; - - if (fold_b_) - alternatives_p_->maximum_length (); - - Moment m =0; - int done =0; - Cons *p = alternatives_p_->music_p_list_p_->head_; - while (p && done < repeats_i_) - { - m = m + p->car_->length_mom (); - done ++; - if (repeats_i_ - done < alternatives_p_->length_i ()) - p = p->next_; - } - return m; + return scm_to_int (me->get_property ("repeat-count")); } -Moment -Repeated_music::length_mom () const +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); +SCM +Repeated_music::volta_music_length (SCM m) { - Moment m =0; - if (fold_b_) - { - if (repeat_body_p_) - m += repeat_body_p_->length_mom (); - } - else - { - Moment beg = (repeat_body_p_) ? repeat_body_p_->length_mom () : Rational(0); - if (!semi_fold_b_) - beg *= Rational (repeats_i_); - m += beg; - } + Music *me = unsmob_music (m); + Moment l = body_get_length (me) + alternatives_volta_get_length (me); + return l.smobbed_copy (); +} - m += alternatives_length_mom (); - return m; +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 (); +}