2003 -> 2004

[lilypond.git] / lily / simultaneous-music.cc

diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index 108ba5dbb61d75d064b6d5d85ec33a803f1d66be..011734b9661e677ae13d12180b1782828dff6eab 100644 (file)
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -1,8 +1,17 @@
+/*   
+  simultaneous-music.cc --  implement Simultaneous_music
 
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#include "input.hh"
 #include "moment.hh"
 #include "pitch.hh"
-#include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
+#include "scm-option.hh"
 
 Moment
 Simultaneous_music::get_length () const
@@ -24,6 +33,18 @@ Simultaneous_music::Simultaneous_music()
 Pitch
 Simultaneous_music::to_relative_octave (Pitch p)
 {
-  return do_relative_octave (p, true);
+  if (lily_1_8_relative)
+    lily_1_8_compatibility_used = true;
+  
+  return music_list_to_relative (music_list(), p, lily_1_8_relative);
 }
+
 ADD_MUSIC (Simultaneous_music);
+
+Pitch
+Event_chord::to_relative_octave (Pitch p)
+{
+  return music_list_to_relative (music_list (), p, true);
+}
+
+ADD_MUSIC(Event_chord);