* lily/accidental-placement.cc (stagger_apes): try to arrange accs

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 93de6c3e3ba30e09186811a34b3265f23e0c3739..21d3edfd0ae2394c7e05aa1950158cbe2f6328ae 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 /*
   UGH. too many includes.
  */
-#include "debug.hh"
+#include "warn.hh"
 #include "music-iterator.hh"
 #include "translator-group.hh"
 #include "music-wrapper.hh"
@@ -19,15 +19,14 @@
 
 Music_iterator::Music_iterator ()
 {
-  //  clone_i_ = 0;
 }
 
 Music_iterator::Music_iterator (Music_iterator const& src)
 {
-  //  clone_i_ = src.clone_i_ + 1;
   handle_ = *src.handle_.clone ();
   music_l_ = src.music_l_;
   music_length_ = src.music_length_;
+  start_mom_ = src.start_mom_;
 }
 
 Music_iterator::~Music_iterator ()
@@ -61,7 +60,6 @@ Music_iterator::pending_moment () const
   return 0;
 }
 
-
 void
 Music_iterator::process (Moment)
 {
@@ -74,7 +72,7 @@ Music_iterator::ok () const
 }
 
 void
-Music_iterator::skip (Moment )
+Music_iterator::skip (Moment)
 {
 }
 
@@ -89,10 +87,10 @@ Music_iterator::static_get_iterator_p (Music *m)
 {
   Music_iterator * p =0;
 
-  SCM type = m->get_mus_property ("type") ;
-  if (unsmob_cxx_function (type))
+  SCM ctor = m->get_mus_property ("iterator-ctor") ;
+  if (unsmob_cxx_function (ctor))
     {
-      Cxx_function f =  unsmob_cxx_function (type);
+      Cxx_function f =  unsmob_cxx_function (ctor);
       
       p = (Music_iterator*) (*f) (SCM_EOL);
     }
@@ -104,22 +102,31 @@ Music_iterator::static_get_iterator_p (Music *m)
     }
 
   p->music_l_ = m;
+  assert (m);
   p->music_length_ = m->length_mom ();
-  
+  p->start_mom_ = m->start_mom ();
   return p;
 }
 
 
 Moment
-Music_iterator::music_length_mom() const
+Music_iterator::music_length_mom () const
 {
   return music_length_;
+
+}
+
+Moment
+Music_iterator::music_start_mom ()const
+{
+  return start_mom_;
 }
 
 void
 Music_iterator::init_translator (Music *m, Translator_group *report_l)
 {
   music_l_ = m;
+  assert (m);
   if (Context_specced_music * csm =dynamic_cast<Context_specced_music *> (m))
     {
       SCM ct = csm->get_mus_property ("context-type");
@@ -154,10 +161,16 @@ Music_iterator::get_iterator_p (Music *m) const
   return p;
 }
 
+/*
+  TODO: rename to prevent confusion between Translator::try_music and
+  Iterator::try_music
+  
+ */
+
 Music_iterator*
 Music_iterator::try_music (Music *m) const
 {
-  bool b = report_to_l ()->try_music ( (Music*)m); // ugh
+  bool b = report_to_l ()->try_music ((Music*)m); // ugh
   Music_iterator * it = b ? (Music_iterator*) this : 0;        // ugh
   if (!it)
     it = try_music_in_children (m);
@@ -170,4 +183,10 @@ Music_iterator::try_music_in_children (Music *) const
   return 0;
 }
 
-IMPLEMENT_CTOR_CALLBACK(Music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Music_iterator);
+
+Music *
+Music_iterator::music_l () const
+{
+  return music_l_;
+}