release commit

[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 e1c72a5e9d7774fc9c58371f2503692e6bbe90d4..4715b76998932167d4e52fcf01443b9e0e53e020 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,40 +3,61 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "translator-group.hh"
-#include "lyric-combine-music-iterator.hh"
 #include "lyric-combine-music.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "note-head.hh"
 #include "grob.hh"
+#include "music-iterator.hh"
+
+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, ());
+protected:
+  virtual void construct_children ();
+  virtual Moment pending_moment () const;
+  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;
+private:
+  bool get_busy_status ()const ;
+  bool melisma_busy (); 
+
+  Music_iterator * music_iter_;
+  Music_iterator * lyric_iter_;
+};
+
 
 
 /*
   Ugh, why static?
  */
-Busy_playing_req *busy_req;
-Melisma_req *melisma_start_req;
-Melisma_req *melisma_stop_req;
-Melisma_playing_req * melisma_playing_req;
+Music *busy_req;
+Music *melisma_playing_req;
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 {
+  music_iter_ =0;
+  lyric_iter_ =0;
+
   if (!busy_req)
     {
-      busy_req = new Busy_playing_req;
-      melisma_playing_req = new Melisma_playing_req;
-      melisma_stop_req = new Melisma_req;
-      melisma_start_req = new Melisma_req;      
-      melisma_start_req->set_span_dir (START);
-      melisma_stop_req->set_span_dir (STOP);
+      busy_req
+       = make_music_by_name (ly_symbol2scm ("BusyPlayingEvent"));
+      melisma_playing_req
+       = make_music_by_name (ly_symbol2scm ("MelismaPlayingEvent"));
     }
-  
-  music_iter_ =0;
-  lyric_iter_ =0;
 }
 
 Moment
@@ -74,7 +95,7 @@ bool
 Lyric_combine_music_iterator::get_busy_status () const
 {
   /*
-    We have to use both the request and the busyGrobs queue.  The
+    We have to use both the event and the busyGrobs queue.  The
     busyGrobs queue doesn't contain any notes that have started this
     instant.  */
   if (try_music (busy_req))
@@ -101,6 +122,18 @@ Lyric_combine_music_iterator::get_busy_status () const
   return false;
 }
 
+
+bool
+Lyric_combine_music_iterator::melisma_busy ()
+{
+  /*
+    We can not read the property, since music_iter_->report_to() might
+    not be the context that sets the melisma properties, but rather a
+    parent context.
+   */
+  return music_iter_->try_music (melisma_playing_req);
+}
+
 void
 Lyric_combine_music_iterator::process (Moment m)
 {
@@ -110,20 +143,13 @@ Lyric_combine_music_iterator::process (Moment m)
   
   music_iter_->process (m);
 
-  if (get_busy_status ())
+  if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ())
     {
-      bool melisma_b = try_music (melisma_playing_req);
-      if (!melisma_b)
-       {
-         if (lyric_iter_->ok ())
-           {
-             Moment m= lyric_iter_->pending_moment ();
-             lyric_iter_->process (m);
-           }
-       }
+      Moment m= lyric_iter_->pending_moment ();
+      lyric_iter_->process (m);
     }
-  
 }
+
 void
 Lyric_combine_music_iterator::do_quit ()
 {
@@ -131,8 +157,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)
 {