patch::: 1.4.0.jcn4

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index a2a82aeccc7272c10d72c625d04e76180f5a9b3a..e3e188e9e2b7bb55304a350470e6e15d98fd0284 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music-list.hh"
@@ -24,17 +24,31 @@ Simultaneous_music::length_mom () const
   return maximum_length ();
 }
 
-Simultaneous_music::Simultaneous_music(SCM head)
+Simultaneous_music::Simultaneous_music (SCM head)
   : Music_sequence (head)
 {
-  set_mus_property ("type",
+  set_mus_property ("iterator-ctor",
                    Simultaneous_music_iterator::constructor_cxx_function);
 }
 
-Sequential_music::Sequential_music(SCM head)
+Simultaneous_music::Simultaneous_music ()
+  : Music_sequence ()
+{
+  set_mus_property ("iterator-ctor",
+                   Simultaneous_music_iterator::constructor_cxx_function);
+  
+}
+
+Sequential_music::Sequential_music (SCM head)
   : Music_sequence (head)
 {
-  set_mus_property ("type",
+  set_mus_property ("iterator-ctor",
+                   Sequential_music_iterator::constructor_cxx_function);
+}
+Sequential_music::Sequential_music ()
+  : Music_sequence ()
+{
+  set_mus_property ("iterator-ctor",
                    Sequential_music_iterator::constructor_cxx_function);
 }
 
@@ -51,10 +65,16 @@ Simultaneous_music::to_relative_octave (Pitch p)
   return do_relative_octave (p, true);
 }
 
-Request_chord::Request_chord(SCM s)
+Request_chord::Request_chord (SCM s)
   : Simultaneous_music (s)
 {
-  set_mus_property ("type",
+  set_mus_property ("iterator-ctor",
+                   Request_chord_iterator::constructor_cxx_function);
+}
+
+Request_chord::Request_chord ()
+{
+  set_mus_property ("iterator-ctor",
                    Request_chord_iterator::constructor_cxx_function);
 }
 
@@ -69,7 +89,7 @@ Request_chord::to_relative_octave (Pitch last)
          Pitch pit = *unsmob_pitch (m->get_mus_property ("pitch"));
          
          pit.to_relative_octave (last);
-         m->set_mus_property ("pitch", pit.smobbed_copy());
+         m->set_mus_property ("pitch", pit.smobbed_copy ());
                  
          return pit;
        }
@@ -79,3 +99,6 @@ Request_chord::to_relative_octave (Pitch last)
 
 
 
+ADD_MUSIC (Simultaneous_music);
+ADD_MUSIC (Sequential_music);
+ADD_MUSIC (Request_chord);