X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=f7eb5d99647cb25180ed6201a2f9247b19fe6087;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=32e8202e81b883ed0963bb45c292722fa9022e82;hpb=d521102157a5c9d71ba80ee8f0eef47e50bd7dd4;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 32e8202e81..f7eb5d9964 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,90 +1,62 @@ -/* - repeated-music.cc -- implement Repeated_music - - source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ - -#include "repeated-music.hh" -#include "music-list.hh" -#include "pitch.hh" -#include "debug.hh" - -Music * -Repeated_music::body ()const -{ - return unsmob_music (get_mus_property ("body")); -} - -Music_sequence* -Repeated_music::alternatives ()const -{ - return dynamic_cast (unsmob_music (get_mus_property ("alternatives"))); -} +/* + This file is part of LilyPond, the GNU music typesetter. -Repeated_music::Repeated_music(SCM l) - : Music (l) -{ - set_mus_property ("type", ly_symbol2scm ("repeated-music")); -} + 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. -Pitch -Repeated_music::to_relative_octave (Pitch p) -{ - if (body ()) - p = body ()->to_relative_octave (p); + 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. - 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); - + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ - return last; -} +#include "repeated-music.hh" +#include "music-sequence.hh" +#include "pitch.hh" +#include "warn.hh" +#include "program-option.hh" -void -Repeated_music::transpose (Pitch p) +Music * +Repeated_music::body (Music *me) { - if (body ()) - body ()->transpose (p); - - if (alternatives ()) - alternatives ()->transpose (p); + return Music::unsmob (me->get_property ("element")); } -void -Repeated_music::compress (Moment p) +SCM +Repeated_music::alternatives (Music *me) { - if (body ()) - body ()->compress (p); - - if (alternatives ()) - alternatives ()->compress (p); + return me->get_property ("elements"); } 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); + + Moment m = 0; + int done = 0; + int count = robust_scm2int (me->get_property ("repeat-count"), 0); - SCM p = alternatives ()->music_list (); - while (gh_pair_p (p) && done < repeat_count ()) + 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 + Music::unsmob (scm_car (p))->get_length (); + done++; + if (count - done < len) + p = scm_cdr (p); } return m; } @@ -94,62 +66,81 @@ Repeated_music::alternatives_length_mom (bool fold) const of volta repeats, where the alternatives are iterated just as they were entered. */ Moment -Repeated_music::alternatives_volta_length_mom () const +Repeated_music::alternatives_volta_get_length (Music *me) { - SCM p = alternatives ()->music_list (); - Moment m; - while (gh_pair_p (p)) - { - m = m + unsmob_music (gh_car (p))->length_mom (); - p = gh_cdr (p); - } - return m; + return Music_sequence::cumulative_length (alternatives (me)); } +/* + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ Moment -Repeated_music::body_length_mom () const +Repeated_music::body_get_length (Music *me) { Moment m = 0; - if (body ()) - { - m = body ()->length_mom (); - } + if (Music *body = Music::unsmob (me->get_property ("element"))) + m = body->get_length (); return m; } -int -Repeated_music::repeat_count () const -{ - return gh_scm2int (get_mus_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, 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 = Music::unsmob (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 = Music::unsmob (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_volta_length_mom (); + Music *me = Music::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::minimum_start (SCM m) +{ + Music *me = Music::unsmob (m); + Music *body = Music::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::first_start (SCM m) +{ + Music *me = Music::unsmob (m); + Music *body = Music::unsmob (me->get_property ("element")); + + Moment rv = (body) ? body->start_mom () + : Music_sequence::first_start (me->get_property ("elements")); + + return rv.smobbed_copy (); +}