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 127945b3d6276e47848c17c2f7b76560bbc3e3ce..37f3d39467ef1916890fe3e96393b57906d69e2a 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,36 +3,58 @@
   
   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 ()
 {
   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;
@@ -74,7 +96,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 +123,33 @@ Lyric_combine_music_iterator::get_busy_status () const
   return false;
 }
 
+
+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.
+   */
+  return music_iter_->try_music (melisma_playing_req);
+#endif
+  
+}
+
 void
 Lyric_combine_music_iterator::process (Moment m)
 {
@@ -110,20 +159,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 ()
 {
@@ -136,8 +178,13 @@ Lyric_combine_music_iterator::do_quit ()
 Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
     : Music_iterator (src)
 {
-  lyric_iter_ = src.lyric_iter_ ? src.lyric_iter_->clone () : 0;
-  music_iter_ = src.music_iter_ ? src.music_iter_->clone () : 0;  
+  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());