X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=39d2418507267ffe20be57e74fa8e3da2fcc039e;hb=ab0cdaac534b56bade64d957ed2cb45b3014ae62;hp=37f3d39467ef1916890fe3e96393b57906d69e2a;hpb=15e565fef41ab50d140c3028bc6d9cff1a43a56a;p=lilypond.git

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 37f3d39467..39d2418507 100644
--- 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,29 +17,42 @@
 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 (); 
-  
+  bool melisma_busy (); 
 
   Music_iterator * music_iter_;
   Music_iterator * lyric_iter_;
 };
 
 
+bool
+melisma_busy (Context* tr)
+{
+  SCM melisma_properties = tr->get_property ("melismaBusyProperties");
+  bool busy = false;
+
+  for (; ly_c_pair_p (melisma_properties);
+       melisma_properties = ly_cdr (melisma_properties))
+    busy = busy || to_boolean (tr->internal_get_property (ly_car (melisma_properties)));
+
+  return busy;
+}
+
+
 
 /*
   Ugh, why static?
@@ -49,6 +62,9 @@ Music *melisma_playing_req;
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 {
+  music_iter_ =0;
+  lyric_iter_ =0;
+
   if (!busy_req)
     {
       busy_req
@@ -56,9 +72,6 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
       melisma_playing_req
 	= make_music_by_name (ly_symbol2scm ("MelismaPlayingEvent"));
     }
-  
-  music_iter_ =0;
-  lyric_iter_ =0;
 }
 
 Moment
@@ -75,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 ());
+  if (lyric_iter_)
+    scm_gc_mark (lyric_iter_->self_scm ());
+}
+
+void
+Lyric_combine_music_iterator::derived_substitute (Context *f,Context * t)
 {
   if (music_iter_)
-    scm_gc_mark (music_iter_->self_scm());
+    music_iter_->substitute_outlet (f,t);
   if (lyric_iter_)
-    scm_gc_mark (lyric_iter_->self_scm());
+    lyric_iter_->substitute_outlet (f,t);
 }
 
 void
@@ -102,14 +124,14 @@ 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();
-  for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
+  Moment now = tr->now_mom ();
+  for (; ly_c_pair_p (grobs); grobs = ly_cdr (grobs))
     {
-      SCM grob = gh_cdar (grobs);
-      Moment end  =*unsmob_moment (gh_caar (grobs));
+      SCM grob = ly_cdar (grobs);
+      Moment end  =*unsmob_moment (ly_caar (grobs));
 
       
       /*
@@ -127,27 +149,12 @@ Lyric_combine_music_iterator::get_busy_status () const
 bool
 Lyric_combine_music_iterator::melisma_busy ()
 {
-#if 0
-  
-  Translator_group * trg = music_iter_->report_to();
-  bool melisma_busy= to_boolean (trg->get_property ("melismaBusy"));
-
-  melisma_busy = melisma_busy ||  to_boolean (trg->get_property ("slurMelismaBusy"));
-  melisma_busy = melisma_busy ||  to_boolean (trg->get_property ("tieMelismaBusy"));
-  melisma_busy = melisma_busy ||  to_boolean (trg->get_property ("beamMelismaBusy"));
-  return melisma_busy;
-
-#else
-
   /*
-    The above code is nicer since it doesn't rely on a special
-    engraver to signal the melisma status. Unfortunately,
-    music_iter_->report_to() might not be the context that sets the
-    melisma properties, but rather a parent context.
+    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.
    */
   return music_iter_->try_music (melisma_playing_req);
-#endif
-  
 }
 
 void
@@ -170,26 +177,9 @@ void
 Lyric_combine_music_iterator::do_quit ()
 {
   if (music_iter_)
-    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 ();
-
+    music_iter_->quit ();
   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*