X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=001eb0e5e40b183edf56e1ea21bab24b0fd01f84;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=fec8d7be73845d6da7907e3e6652bcebd16a489a;hpb=4975901229a1b074f6c93d812e15d653aa8e2952;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index fec8d7be73..001eb0e5e4 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,155 +1,146 @@ -/* - 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. + + Copyright (C) 1999--2015 Han-Wen Nienhuys + + 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. + + 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. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #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 (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) +Moment +Repeated_music::alternatives_get_length (Music *me, bool fold) { - if (beg) - { - set_mus_property ("body", beg->self_scm ()); - scm_unprotect_object (beg->self_scm ()); - } - set_mus_property ("repeat-count", gh_int2scm (times)); + SCM alternative_list = alternatives (me); + int len = scm_ilength (alternative_list); + if (len <= 0) + return 0; - if (alts) + 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) { - alts->truncate (times); - set_mus_property ("alternatives", alts->self_scm ()); - scm_unprotect_object (alts->self_scm ()); + m = m + unsmob (scm_car (p))->get_length (); + done++; + if (count - done < len) + p = scm_cdr (p); } - set_mus_property ("type", ly_symbol2scm ("repeated-music")); + return m; } -Repeated_music::Repeated_music (Repeated_music const &s) - : Music (s) +/* + 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) { + return Music_sequence::cumulative_length (alternatives (me)); } - -Pitch -Repeated_music::to_relative_octave (Pitch p) +/* + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ +Moment +Repeated_music::body_get_length (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; + Moment m = 0; + if (Music *body = unsmob (me->get_property ("element"))) + m = body->get_length (); + return m; } -void -Repeated_music::transpose (Pitch p) -{ - if (body ()) - body ()->transpose (p); +MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1); - if (alternatives ()) - alternatives ()->transpose (p); -} - -void -Repeated_music::compress (Moment p) +SCM +Repeated_music::unfolded_music_length (SCM m) { - if (body ()) - body ()->compress (p); + Music *me = unsmob (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 (bool fold) const +MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); +SCM +Repeated_music::folded_music_length (SCM m) { - if (!alternatives () ) - return 0; - - if (fold) - return alternatives ()->maximum_length (); - - Moment m =0; - int done =0; - - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p) && done < repeat_count ()) - { - m = m + unsmob_music (gh_car (p))->length_mom (); - done ++; - if (repeat_count () - done < alternatives ()->length_i ()) - p = gh_cdr (p); - } - return m; -} + Music *me = unsmob (m); -Moment -Repeated_music::body_length_mom () const -{ - Moment m = 0; - if (body ()) - { - m = body ()->length_mom (); - } - return m; + Moment l = body_get_length (me) + alternatives_get_length (me, true); + return l.smobbed_copy (); } int -Repeated_music::repeat_count () const +Repeated_music::repeat_count (Music *me) { - return gh_scm2int (get_mus_property ("repeat-count")); + return scm_to_int (me->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); - +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); SCM -Repeated_music::unfolded_music_length (SCM m) +Repeated_music::volta_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 (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::folded_music_length (SCM m) +Repeated_music::minimum_start (SCM m) { - Repeated_music* r = dynamic_cast (unsmob_music (m)); - - Moment l = r->body_length_mom () + r->alternatives_length_mom (true); - return l.smobbed_copy (); + Music *me = unsmob (m); + Music *body = unsmob (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::volta_music_length (SCM m) +Repeated_music::first_start (SCM m) { - Repeated_music* r = dynamic_cast (unsmob_music (m)); - Moment l = r->body_length_mom () + r->alternatives_length_mom (false); - return l.smobbed_copy (); + Music *me = unsmob (m); + Music *body = unsmob (me->get_property ("element")); + + Moment rv = (body) ? body->start_mom () + : Music_sequence::first_start (me->get_property ("elements")); + + return rv.smobbed_copy (); }