* lily/side-position-interface.cc: remove add_staff_support ()

[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 2e9a870ba1d96dbffb451520f3a39c60a3556c54..3b3e19ec7823da33daf0d358231e8d3d8740dec2 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -30,16 +30,30 @@ protected:
 
   virtual bool ok () const;
   virtual void derived_mark () const;
+  virtual void derived_substitute (Translator_group*,Translator_group*) ;
 private:
   bool get_busy_status ()const ;
-  bool  melisma_busy (); 
-  
+  bool melisma_busy (); 
 
   Music_iterator * music_iter_;
   Music_iterator * lyric_iter_;
 };
 
 
+bool
+melisma_busy (Translator* tr)
+{
+  SCM melisma_properties = tr->get_property ("melismaBusyProperties");
+  bool busy = false;
+
+  for (; gh_pair_p (melisma_properties);
+       melisma_properties = gh_cdr (melisma_properties))
+    busy = busy || to_boolean (tr->internal_get_property (gh_car (melisma_properties)));
+
+  return busy;
+}
+
+
 
 /*
   Ugh, why static?
@@ -49,6 +63,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 +73,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
@@ -83,6 +97,15 @@ Lyric_combine_music_iterator::derived_mark()const
     scm_gc_mark (lyric_iter_->self_scm());
 }
 
+void
+Lyric_combine_music_iterator::derived_substitute (Translator_group*f,Translator_group* t)
+{
+  if (music_iter_)
+    music_iter_->substitute_outlet (f,t);
+  if (lyric_iter_)
+    lyric_iter_->substitute_outlet (f,t);
+}
+
 void
 Lyric_combine_music_iterator::construct_children ()
 {
@@ -158,8 +181,8 @@ Lyric_combine_music_iterator::do_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)
 {