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 72e59e1d612fda3b0d44ab0a180242374ca2ae7b..5ea7f712186579e8b819b19e7301be464a293e64 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
@@ -28,9 +28,11 @@ Simultaneous_music_iterator::construct_children()
   int j = 0;
   Music_sequence const *sim = dynamic_cast<Music_sequence const*> (music_l_);
 
-  for (Cons<Music> *i = sim->music_p_list_p_->head_; i;  i = i->next_, j++)
+  SCM i = sim->music_list ();
+  for (; gh_pair_p(i); i = gh_cdr(i), j++)
     {
-      Music_iterator * mi = static_get_iterator_p (i->car_);
+      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 */
@@ -40,7 +42,10 @@ Simultaneous_music_iterator::construct_children()
                                                    to_str (j))
        : report_to_l ();
 
-      mi->init_translator (i->car_, t);
+      if (!t)
+       t = report_to_l ();
+
+      mi->init_translator (mus, t);
       mi->construct_children ();
       
       if (mi->ok()) 
@@ -101,3 +106,11 @@ Simultaneous_music_iterator::ok() const
   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;
+}