X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=666b1fbf1dee6bccb2976ddd4c48e73e13ff23a1;hb=af99781b40aed8c6dedbd7d78f1a893355a98e09;hp=f2e9b77daae147c1212967f29a1609bd511d2f0b;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index f2e9b77daa..666b1fbf1d 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,141 +1,162 @@ -/* - repeated-music.cc -- implement Repeated_music - +/* + repeated-music.cc -- implement Repeated_music + source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ + + (c) 1999--2007 Han-Wen Nienhuys +*/ #include "repeated-music.hh" -#include "music-list.hh" -#include "musical-pitch.hh" -#include "debug.hh" +#include "music-sequence.hh" +#include "pitch.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 +SCM +Repeated_music::alternatives (Music *me) { - return dynamic_cast (unsmob_music (get_mus_property ("alternatives"))); + return me->get_property ("elements"); } -Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts) +MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2); +SCM +Repeated_music::relative_callback (SCM music, SCM pitch) { - set_mus_property ("body", beg->self_scm_); - fold_b_ = false; - repeats_i_ = times; - volta_fold_b_ = true; - if (alts) + Pitch p = *unsmob_pitch (pitch); + Music *me = unsmob_music (music); + if (lily_1_8_relative) { - alts->truncate (times); - set_mus_property ("alternatives", alts->self_scm_); - } -} + Music *body = unsmob_music (me->get_property ("element")); + if (body) + p = body->to_relative_octave (p); -Repeated_music::Repeated_music (Repeated_music const &s) - : Music (s) -{ - repeats_i_ = s.repeats_i_; - fold_b_ = s.fold_b_; - volta_fold_b_ = s.volta_fold_b_; - type_ = s.type_; -} + 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); + } -void -Repeated_music::do_print () const -{ -#ifndef NPRINT - DEBUG_OUT << "Fold = " << fold_b_ << " reps: " << repeats_i_; - - if (body ()) - body ()->print(); - - if (alternatives ()) - alternatives ()->print(); -#endif + 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 (body ()) - p = body ()->to_relative_octave (p); + SCM alternative_list = alternatives (me); + int len = scm_ilength (alternative_list); + if (len <= 0) + return 0; - Musical_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 (fold) + return Music_sequence::maximum_length (alternative_list); - return last; + 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; } -void -Repeated_music::transpose (Musical_pitch p) +/* + 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 (body ()) - body ()->transpose (p); + return Music_sequence::cumulative_length (alternatives (me)); +} - if (alternatives ()) - alternatives ()->transpose (p); +/* + 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; } -void -Repeated_music::compress (Moment p) +MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1); + +SCM +Repeated_music::unfolded_music_length (SCM m) { - if (body ()) - body ()->compress (p); + Music *me = unsmob_music (m); - if (alternatives ()) - alternatives ()->compress (p); + Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false); + return l.smobbed_copy (); } -Moment -Repeated_music::alternatives_length_mom () const +MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); +SCM +Repeated_music::folded_music_length (SCM m) { - if (!alternatives () ) - return 0; - - if (fold_b_) - return alternatives ()->maximum_length (); + Music *me = unsmob_music (m); - Moment m =0; - int done =0; + Moment l = body_get_length (me) + alternatives_get_length (me, true); + return l.smobbed_copy (); +} - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p) && done < repeats_i_) - { - m = m + unsmob_music (gh_car (p))->length_mom (); - done ++; - if (volta_fold_b_ - || repeats_i_ - done < alternatives ()->length_i ()) - p = gh_cdr (p); - } - return m; +int +Repeated_music::repeat_count (Music *me) +{ + return scm_to_int (me->get_property ("repeat-count")); } -Moment -Repeated_music::body_length_mom () const +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); +SCM +Repeated_music::volta_music_length (SCM m) { - Moment m = 0; - if (body ()) - { - m = body ()->length_mom (); - if (!fold_b_ && !volta_fold_b_) - m *= Rational (repeats_i_); - } - return m; + Music *me = unsmob_music (m); + Moment l = body_get_length (me) + alternatives_volta_get_length (me); + return l.smobbed_copy (); } -Moment -Repeated_music::length_mom () const +MAKE_SCHEME_CALLBACK (Repeated_music, minimum_start, 1); +SCM +Repeated_music::minimum_start (SCM m) { - return body_length_mom () + alternatives_length_mom (); + 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 (); +}