release: 1.3.73

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 2f28eb32af8ab71f279657e4303d3bc1d4b3f4e9..5ea7f712186579e8b819b19e7301be464a293e64 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -3,68 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
 #include "debug.hh"
 #include "simultaneous-music-iterator.hh"
-
 #include "music-list.hh"
+#include "killing-cons.tcc"
 
 Simultaneous_music_iterator::Simultaneous_music_iterator ()
 {
+  separate_contexts_b_ = false;
 }
 
 Simultaneous_music_iterator::~Simultaneous_music_iterator ()
 {
+  children_p_list_.junk ();
 }
 
 void
 Simultaneous_music_iterator::construct_children()
 {
   int j = 0;
-  Simultaneous_music const *sim = dynamic_cast<Simultaneous_music const*> (music_l_);
-  for (PCursor<Music*> i (sim->music_p_list_p_->top());  
-       i.ok(); j++, i++) 
+  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++)
     {
-      Music_iterator * mi = get_iterator_p (i.ptr());
+      Music *mus = unsmob_music (gh_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_,
+                                                   to_str (j))
+       : report_to_l ();
+
+      if (!t)
+       t = report_to_l ();
+
+      mi->init_translator (mus, t);
+      mi->construct_children ();
+      
       if (mi->ok()) 
        {
-         if  (sim->translator_type_str_.empty_b ())
-           set_translator (mi->report_to_l()->ancestor_l (0)); // huh?
-         children_p_list_.bottom().add (mi);
+         children_p_list_.append (new Killing_cons<Music_iterator> (mi,0));
        }
-      else 
+      else
        delete mi;
     }
 }
 
-
 void
 Simultaneous_music_iterator::do_print() const
 {
 #ifndef NPRINT
-  for (PCursor<Music_iterator*> i (children_p_list_.top()); i.ok (); i++) 
-    {
-      i->print();
-    }
+  for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
+    p->car_->print();
 #endif
 }
 
 void
 Simultaneous_music_iterator::do_process_and_next (Moment until)
 {
-  for (PCursor<Music_iterator*> i (children_p_list_.top()); i.ok ();) 
+  for (Cons<Music_iterator> **pp = &children_p_list_.head_; *pp; )
     {
+      Music_iterator * i = (*pp)->car_;
       if  (i->next_moment() == until) 
        {
          i->process_and_next (until);
        }
-      if (!i->ok()) 
-       delete i.remove_p();
+      if (!i->ok())
+       delete children_p_list_.remove_cons (pp);
       else
-       i++;
+       pp = &(*pp)->next_;
     }
   Music_iterator::do_process_and_next (until);
 }
@@ -77,8 +92,9 @@ Simultaneous_music_iterator::next_moment() const
 {
   Moment next;
   next.set_infinite (1);
-  for (PCursor<Music_iterator*> i (children_p_list_.top()); i.ok (); i++)
-    next = next <? i->next_moment() ;
+  
+  for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
+    next = next <? p->car_->next_moment() ;
   return next;
 }
 
@@ -87,6 +103,14 @@ Simultaneous_music_iterator::next_moment() const
 bool
 Simultaneous_music_iterator::ok() const
 {
-  return children_p_list_.size();
+  return children_p_list_.head_;
 }
 
+Music_iterator*
+Simultaneous_music_iterator::try_music_in_children (Music *m) const
+{
+  Music_iterator * b=0;
+  for (Cons<Music_iterator> *p = children_p_list_.head_; !b && p; p = p->next_)
+    b =p->car_->try_music (m);
+  return b;
+}