From 1bda6a34f97f392c134662e17fd902c1a60ad50e Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:44:43 +0000 Subject: [PATCH] lilypond-1.1.9 --- lily/repeated-music.cc | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 4f22f72c27..a3751c38cb 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -11,7 +11,7 @@ #include "musical-pitch.hh" //Repeated_music::Repeated_music (Music* r, int n, Music_list* a) -Repeated_music::Repeated_music (Music* r, int n, Sequential_music* a) +Repeated_music::Repeated_music (Music* r, int n, Music_sequence* a) { repeats_i_ = n; repeat_p_ = r; @@ -29,7 +29,8 @@ Repeated_music::Repeated_music (Repeated_music const& s) { repeat_p_ = (s.repeat_p_) ? s.repeat_p_->clone () : 0; // urg? - alternative_p_ = (s.alternative_p_) ? dynamic_cast (s.alternative_p_->clone ()) : 0; +// alternative_p_ = (s.alternative_p_) ? dynamic_cast (s.alternative_p_->clone ()) : 0; + alternative_p_ = (s.alternative_p_) ? dynamic_cast (s.alternative_p_->clone ()) : 0; } void @@ -61,3 +62,23 @@ Repeated_music::duration () const return m; } + +Musical_pitch +Repeated_music::to_relative_octave (Musical_pitch p) +{ + p = repeat_p_->to_relative_octave (p); + + p = alternative_p_->do_relative_octave (p, false); + return p; + + /* ugh. Should + \relative c'' \repeat 2 { c4 } { < ... > } + + and + + \relative c'' \repeat 2 { c4 } + { { ...} } + + behave differently? + */ +} -- 2.39.5