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

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 252a288f0d397938a8f86b2b82c7f07863530ac0..cc246f8a48a70f3c6e3125e828f60e9d113f9f55 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -3,27 +3,26 @@
 
   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>
 */
 
 #include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
 #include "killing-cons.tcc"
 
+
 Simultaneous_music_iterator::Simultaneous_music_iterator ()
 {
   separate_contexts_b_ = false;
-  cursor_i_ = 0;
 }
 
 Simultaneous_music_iterator::Simultaneous_music_iterator (Simultaneous_music_iterator const& src)
   : Music_iterator (src)
 {
-  cursor_i_ = src.cursor_i_;
   separate_contexts_b_ = src.separate_contexts_b_;
-  for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
+  for (Cons<Music_iterator> *p = src.children_p_list_.head_; p; p = p->next_)
     {
       Music_iterator *i = p->car_;
       children_p_list_.append (new Killing_cons<Music_iterator> (i->clone (), 0));
@@ -35,50 +34,33 @@ Simultaneous_music_iterator::~Simultaneous_music_iterator ()
   children_p_list_.junk ();
 }
 
-bool
-Simultaneous_music_iterator::next ()
-{
-  for (Cons<Music_iterator> **pp = &children_p_list_.head_; *pp;)
-    {
-      Music_iterator *i = (*pp)->car_;
-      if (i->ok ())
-       i->next ();
-      if (!i->ok ())
-       delete children_p_list_.remove_cons (pp);
-      else
-       pp = &(*pp)->next_;
-    }
-  return ok ();
-}
-
 SCM
-Simultaneous_music_iterator::get_music ()
+Simultaneous_music_iterator::get_music (Moment m)const
 {
   SCM s = SCM_EOL;
   for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
     {
-      s = gh_append2 (p->car_->get_music (), s);
+      s = gh_append2 (p->car_->get_music (m), s);
     }
   return s;
 }
 
 void
-Simultaneous_music_iterator::construct_children()
+Simultaneous_music_iterator::construct_children ()
 {
   int j = 0;
-  Music_sequence const *sim = dynamic_cast<Music_sequence const*> (music_l_);
 
-  SCM i = sim->music_list ();
-  for (; gh_pair_p(i); i = gh_cdr(i), j++)
+  SCM i = music_l ()->get_mus_property ("elements");
+  for (; gh_pair_p (i); i = ly_cdr (i), j++)
     {
-      Music *mus = unsmob_music (gh_car (i));
+      Music *mus = unsmob_music (ly_car (i));
       Music_iterator * mi = static_get_iterator_p (mus);
 
       /* if separate_contexts_b_ is set, create a new context with the
         number number as name */
       
       Translator_group * t = (j && separate_contexts_b_)
-       ? report_to_l ()->find_create_translator_l (report_to_l()->type_str_,
+       ? report_to_l ()->find_create_translator_l (report_to_l ()->type_str_,
                                                    to_str (j))
        : report_to_l ();
 
@@ -88,7 +70,7 @@ Simultaneous_music_iterator::construct_children()
       mi->init_translator (mus, t);
       mi->construct_children ();
       
-      if (mi->ok()) 
+      if (mi->ok ()) 
        {
          children_p_list_.append (new Killing_cons<Music_iterator> (mi,0));
        }
@@ -97,50 +79,56 @@ Simultaneous_music_iterator::construct_children()
     }
 }
 
+
 void
-Simultaneous_music_iterator::do_print() const
+Simultaneous_music_iterator::process (Moment until)
 {
-#ifndef NPRINT
-  for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
-    p->car_->print();
-#endif
+  for (Cons<Music_iterator> **pp = &children_p_list_.head_; *pp;)
+    {
+      Music_iterator * i = (*pp)->car_;
+      if (i->pending_moment () == until) 
+       {
+         i->process (until);
+       }
+      if (!i->ok ())
+       delete children_p_list_.remove_cons (pp);
+      else
+       pp = & (*pp)->next_;
+    }
 }
 
 void
-Simultaneous_music_iterator::do_process (Moment until)
+Simultaneous_music_iterator::skip (Moment until)
 {
-#if 1
   for (Cons<Music_iterator> **pp = &children_p_list_.head_; *pp;)
     {
       Music_iterator * i = (*pp)->car_;
-      if  (i->next_moment() == until) 
+      if (i->pending_moment () <= until) 
        {
-         i->process (until);
+         i->skip (until);
        }
-      if (!i->ok())
+      if (!i->ok ())
        delete children_p_list_.remove_cons (pp);
       else
-       pp = &(*pp)->next_;
+       pp = & (*pp)->next_;
     }
-  Music_iterator::do_process (until);
-#endif
 }
 
 Moment
-Simultaneous_music_iterator::next_moment() const
+Simultaneous_music_iterator::pending_moment () const
 {
   Moment next;
   next.set_infinite (1);
   
   for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
-    next = next <? p->car_->next_moment() ;
+    next = next <? p->car_->pending_moment () ;
   return next;
 }
 
 
 
 bool
-Simultaneous_music_iterator::ok() const
+Simultaneous_music_iterator::ok () const
 {
   return children_p_list_.head_;
 }
@@ -153,3 +141,7 @@ Simultaneous_music_iterator::try_music_in_children (Music *m) const
     b =p->car_->try_music (m);
   return b;
 }
+
+
+
+IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);