X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=2560391a08c8ce07ebb210f76402ff4913f92e9f;hb=cc88cd368096843ec42d001fe96eca038d1bd3be;hp=48848dd9fe2acb94fbe5e5c72d374b7185887891;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 48848dd9fe..2560391a08 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,84 +1,173 @@ -/* - repeated-music.cc -- implement Repeated_music - - source file of the GNU LilyPond music typesetter - - (c) 1998--1999 Jan Nieuwenhuizen - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1999--2011 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 "musical-pitch.hh" +#include "music-sequence.hh" +#include "pitch.hh" +#include "warn.hh" +#include "program-option.hh" -Repeated_music::Repeated_music (Music* r, int n, Music_sequence* a) +Music * +Repeated_music::body (Music *me) { - repeats_i_ = n; - unfold_b_ = false; - repeat_p_ = r; - alternative_p_ = a; + return unsmob_music (me->get_property ("element")); } -Repeated_music::~Repeated_music () +SCM +Repeated_music::alternatives (Music *me) { - delete repeat_p_; - delete alternative_p_; + return me->get_property ("elements"); } -Repeated_music::Repeated_music (Repeated_music const& s) - : Music (s) +MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2); +SCM +Repeated_music::relative_callback (SCM music, SCM pitch) { - repeats_i_ = s.repeats_i_; - repeat_p_ = (s.repeat_p_) ? s.repeat_p_->clone () : 0; - // urg? - alternative_p_ = (s.alternative_p_) ? dynamic_cast (s.alternative_p_->clone ()) : 0; + 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 (); } -void -Repeated_music::do_print () const +Moment +Repeated_music::alternatives_get_length (Music *me, bool fold) { - if (repeat_p_) - repeat_p_->print (); - if (alternative_p_) - alternative_p_->print (); + SCM alternative_list = alternatives (me); + int len = scm_ilength (alternative_list); + if (len <= 0) + return 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 = 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 (repeat_p_) - repeat_p_->transpose (p); - if (alternative_p_) - alternative_p_->transpose (p); + return Music_sequence::cumulative_length (alternatives (me)); } +/* + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ Moment -Repeated_music::length_mom () const +Repeated_music::body_get_length (Music *me) { - Moment m; - if (repeat_p_) - m += repeat_p_->length_mom (); - if (alternative_p_) - m += alternative_p_->length_mom (); + 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); + +SCM +Repeated_music::unfolded_music_length (SCM m) +{ + 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) +{ + Music *me = unsmob_music (m); + + Moment l = body_get_length (me) + alternatives_get_length (me, true); + return l.smobbed_copy (); +} -Musical_pitch -Repeated_music::to_relative_octave (Musical_pitch p) +int +Repeated_music::repeat_count (Music *me) { - p = repeat_p_->to_relative_octave (p); + return scm_to_int (me->get_property ("repeat-count")); +} - p = alternative_p_->do_relative_octave (p, false); - return p; - - /* ugh. Should - \relative c'' \repeat 2 { c4 } { < ... > } +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); +SCM +Repeated_music::volta_music_length (SCM m) +{ + 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")); - and - - \relative c'' \repeat 2 { c4 } - { { ...} } + Moment rv = (body) ? body->start_mom () + : Music_sequence::first_start (me->get_property ("elements")); - behave differently? - */ + return rv.smobbed_copy (); }