* input/mozart-hrn3-defs.ly (startGraceContext): Customize grace init.

[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 035b83b7c8d05547b47158bebd952bf2288000b7..9c51b2d1774bff63e62e2090c56b26d089ceb9c5 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,6 +11,9 @@
 #include "lyric-combine-music-iterator.hh"
 #include "lyric-combine-music.hh"
 #include "musical-request.hh"
+#include "note-head.hh"
+#include "grob.hh"
+
 
 /*
   Ugh, why static?
@@ -29,8 +32,8 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
       melisma_stop_req = new Melisma_req;
       melisma_start_req = new Melisma_req;      
     }
-  melisma_start_req->span_dir_ = START;
-  melisma_stop_req->span_dir_ = STOP;
+  melisma_start_req->set_span_dir (START);
+  melisma_stop_req->set_span_dir (STOP);
   
   music_iter_p_ =0;
   lyric_iter_p_ =0;
@@ -53,12 +56,43 @@ Lyric_combine_music_iterator::ok () const
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (music_l_);
+  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (music_l ());
   
   music_iter_p_ = get_iterator_p (m->music_l ());
   lyric_iter_p_ = get_iterator_p (m->lyrics_l ());
 }
 
+bool
+Lyric_combine_music_iterator::get_busy_status () const
+{
+  /*
+    We have to use both the request and the busyGrobs queue.  The
+    busyGrobs queue doesn't contain any notes that have started this
+    instant.  */
+  if (try_music (busy_req))
+    return true;
+  
+  Translator_group * tr = music_iter_p_->report_to_l ();
+
+  SCM grobs = tr->get_property ("busyGrobs");
+  Moment now = tr->now_mom();
+  for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
+    {
+      SCM grob = gh_cdar (grobs);
+      Moment end  =*unsmob_moment (gh_caar (grobs));
+
+      
+      /*
+       This is slightly ugh: we are now confunding the frontend
+       (iterators) and the backend (note heads) */
+      if (end > now
+         && Note_head::has_interface (unsmob_grob (grob)))
+       return true;
+    }
+
+  return false;
+}
+
 void
 Lyric_combine_music_iterator::process (Moment m)
 {
@@ -68,8 +102,7 @@ Lyric_combine_music_iterator::process (Moment m)
   
   music_iter_p_->process (m);
 
-  bool busy = try_music (busy_req);
-  if (busy)
+  if ( get_busy_status ())
     {
       bool melisma_b = try_music (melisma_playing_req);
       if (!melisma_b)
@@ -98,6 +131,13 @@ Lyric_combine_music_iterator::~Lyric_combine_music_iterator ()
   delete music_iter_p_;
 }
 
+Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
+    : Music_iterator (src)
+{
+  lyric_iter_p_ = src.lyric_iter_p_ ? src.lyric_iter_p_->clone () : 0;
+  music_iter_p_ = src.music_iter_p_ ? src.music_iter_p_->clone () : 0;  
+}
+
 Music_iterator*
 Lyric_combine_music_iterator::try_music_in_children (Music *m) const
 {
@@ -108,3 +148,5 @@ Lyric_combine_music_iterator::try_music_in_children (Music *m) const
     return lyric_iter_p_->try_music (m);
 }
 
+
+IMPLEMENT_CTOR_CALLBACK (Lyric_combine_music_iterator);