lilypond-1.1.9

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index a87cb8d4dd89c8c60d354831b7a53dcd51c80579..7e5e310adca9f1f3007f2fad77d9886325057592 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -36,7 +36,7 @@ public:
   Music_sequence (Music_list *l_p);
   
   VIRTUAL_COPY_CONS(Music);
-
+  Musical_pitch do_relative_octave (Musical_pitch p, bool b);
   virtual void transpose (Musical_pitch );
   virtual void compress (Moment);
   void add_music (Music *music_p);

diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index b068c242caf576d1cfe93c067e08168f35afcc51..1528f5810b195c2d9375a15c826e81d9ac1e1510 100644 (file)
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -21,17 +21,17 @@ public:
   int repeats_i_;
   Music* repeat_p_;
 //  Music_list* alternative_p_;
-  Sequential_music* alternative_p_;
+  Music_sequence* alternative_p_;
 
 //  Repeated_music (Music*, int n, Music_list*);
-  Repeated_music (Music*, int n, Sequential_music*);
+  Repeated_music (Music*, int n, Music_sequence*);
   Repeated_music (Repeated_music const& s);
   virtual ~Repeated_music ();
   
   virtual void do_print () const;
   virtual void transpose (Musical_pitch p);
   virtual Moment duration () const;
-
+  virtual Musical_pitch to_relative_octave (Musical_pitch p);
   VIRTUAL_COPY_CONS(Music);
 };
 

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 42d9b801e86c2d6a6cd69d21da1b4e1b67ce8134..d6fe224a9cef7471389e5e798f8b8a454e00fc7a 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -59,15 +59,20 @@ Sequential_music::duration () const
 Musical_pitch
 Sequential_music::to_relative_octave (Musical_pitch p)
 {
-  return music_p_list_p_->do_relative_octave (p, false);
+  return do_relative_octave (p, false);
 }
 
 Musical_pitch
 Simultaneous_music::to_relative_octave (Musical_pitch p)
 {
-  return music_p_list_p_->do_relative_octave (p, true);
+  return do_relative_octave (p, true);
 }
 
+Musical_pitch
+Music_sequence::do_relative_octave (Musical_pitch p, bool b)
+{
+  return music_p_list_p_->do_relative_octave (p, b);  
+}
 
 Musical_pitch 
 Music_list::do_relative_octave (Musical_pitch last, bool ret_first)

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index c91a81df3d9fefd8a9a7febd961ab06e56dacc28..81ee24960554fda18ea8b0f8b48833dabf214570 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -49,3 +49,10 @@ Music_wrapper::duration () const
 {
   return element_p_->duration ();
 }
+
+
+Musical_pitch
+Music_wrapper::to_relative_octave (Musical_pitch p)
+{
+  return element_p_->to_relative_octave (p);
+}