* scripts/lilypond-book.py (Lilypond_snippet.is_outdated): require

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

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 138a4ddcf1c181734e182b0c3846e86e98535c82..74c076670bdc9282660bd40edf7554fde6fce306 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,11 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "translator-group.hh"
+#include "context.hh"
 #include "lyric-combine-music.hh"
 #include "event.hh"
 #include "note-head.hh"
@@ -17,19 +17,19 @@
 class Lyric_combine_music_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   Lyric_combine_music_iterator ();
   Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
-  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual void construct_children ();
   virtual Moment pending_moment () const;
-  virtual void do_quit(); 
+  virtual void do_quit (); 
   virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
 
   virtual bool ok () const;
   virtual void derived_mark () const;
+  virtual void derived_substitute (Context *,Context *) ;
 private:
   bool get_busy_status ()const ;
   bool melisma_busy (); 
@@ -40,7 +40,7 @@ private:
 
 
 bool
-melisma_busy (Translator* tr)
+melisma_busy (Context* tr)
 {
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
@@ -88,12 +88,21 @@ Lyric_combine_music_iterator::ok () const
 }
 
 void
-Lyric_combine_music_iterator::derived_mark()const
+Lyric_combine_music_iterator::derived_mark ()const
 {
   if (music_iter_)
-    scm_gc_mark (music_iter_->self_scm());
+    scm_gc_mark (music_iter_->self_scm ());
   if (lyric_iter_)
-    scm_gc_mark (lyric_iter_->self_scm());
+    scm_gc_mark (lyric_iter_->self_scm ());
+}
+
+void
+Lyric_combine_music_iterator::derived_substitute (Context *f,Context * t)
+{
+  if (music_iter_)
+    music_iter_->substitute_outlet (f,t);
+  if (lyric_iter_)
+    lyric_iter_->substitute_outlet (f,t);
 }
 
 void
@@ -115,10 +124,10 @@ Lyric_combine_music_iterator::get_busy_status () const
   if (try_music (busy_req))
     return true;
   
-  Translator_group * tr = music_iter_->report_to ();
+  Context * tr = music_iter_->get_outlet ();
 
   SCM grobs = tr->get_property ("busyGrobs");
-  Moment now = tr->now_mom();
+  Moment now = tr->now_mom ();
   for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
     {
       SCM grob = gh_cdar (grobs);
@@ -141,7 +150,7 @@ bool
 Lyric_combine_music_iterator::melisma_busy ()
 {
   /*
-    We can not read the property, since music_iter_->report_to() might
+    We can not read the property, since music_iter_->get_outlet () might
     not be the context that sets the melisma properties, but rather a
     parent context.
    */
@@ -168,26 +177,9 @@ void
 Lyric_combine_music_iterator::do_quit ()
 {
   if (music_iter_)
-    music_iter_->quit();
+    music_iter_->quit ();
   if (lyric_iter_)
-    lyric_iter_->quit();
-}
-
-Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
-    : Music_iterator (src)
-{
-  lyric_iter_ = 0;
-  music_iter_ = 0;
-
-  if (src.lyric_iter_)
-    lyric_iter_ =  src.lyric_iter_->clone ();
-  if (src.music_iter_)
-    music_iter_ =  src.music_iter_->clone ();
-
-  if (lyric_iter_)
-    scm_gc_unprotect_object (lyric_iter_->self_scm());
-  if (music_iter_)
-    scm_gc_unprotect_object (music_iter_->self_scm());
+    lyric_iter_->quit ();
 }
 
 Music_iterator*