X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=13e12df2a48af8f8bcc61540b64658a7649c0a2e;hb=53da8b7d3773da804e79fd455d168efd9475d2f9;hp=6f2a0913befc73cc86c61552788aac4c59c3c706;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 6f2a0913be..13e12df2a4 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,155 +1,173 @@ -/* - repeated-music.cc -- implement Repeated_music - - source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. -#include "repeated-music.hh" -#include "music-list.hh" -#include "musical-pitch.hh" -#include "debug.hh" + Copyright (C) 1999--2012 Han-Wen Nienhuys -Music * -Repeated_music::body ()const -{ - return unsmob_music (get_mus_property ("body")); -} + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -Music_sequence* -Repeated_music::alternatives ()const -{ - return dynamic_cast (unsmob_music (get_mus_property ("alternatives"))); -} + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts) -{ - if (beg) - { - set_mus_property ("body", beg->self_scm ()); - scm_unprotect_object (beg->self_scm ()); - } - set_mus_property ("repeat-count", gh_int2scm (times)); + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ - if (alts) - { - alts->truncate (times); - set_mus_property ("alternatives", alts->self_scm ()); - scm_unprotect_object (alts->self_scm ()); - } - set_mus_property ("type", ly_symbol2scm ("repeated-music")); -} +#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) { + return unsmob_music (me->get_property ("element")); } - -Musical_pitch -Repeated_music::to_relative_octave (Musical_pitch p) +SCM +Repeated_music::alternatives (Music *me) { - if (body ()) - p = body ()->to_relative_octave (p); - - 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); - - - return last; + return me->get_property ("elements"); } -void -Repeated_music::transpose (Musical_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); - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p) && done < repeat_count ()) + 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 (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; } +/* + 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 (Music *me) { - Moment m = 0; - if (body ()) - { - m = body ()->length_mom (); - } - return m; + return Music_sequence::cumulative_length (alternatives (me)); } -int -Repeated_music::repeat_count () const +/* + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ +Moment +Repeated_music::body_get_length (Music *me) { - return gh_scm2int (get_mus_property ("repeat-count")); + 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); -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_length_mom (false); + 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 (); +}