X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=26a4dfa5871a2d23cfaa3d6a21ad5e6c49bfd8d2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4235289486e89262bcd0eb621be698c44cf000c8;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 4235289486..26a4dfa587 100644
--- 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) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dispatcher.hh"
@@ -51,34 +51,45 @@ private:
   DECLARE_LISTENER (set_busy);
   DECLARE_LISTENER (check_new_context);
 
-  bool pending_grace_lyric_;
   bool music_found_;
   Context *lyrics_context_;
   Context *music_context_;
   SCM lyricsto_voice_name_;
 
-  bool busy_;
+  Moment busy_moment_;
+  Moment pending_grace_moment_;
+  
   Music_iterator *lyric_iter_;
 };
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 {
   music_found_ = false;
-  pending_grace_lyric_ = false;
+  pending_grace_moment_.set_infinite (1);
   lyric_iter_ = 0;
   music_context_ = 0;
   lyrics_context_ = 0;
-  busy_ = false;
+  busy_moment_.set_infinite (-1);
 }
 
+
+/*
+  It's dubious whether we can ever make this fully work.  Due to
+  associatedVoice switching, this routine may be triggered for 
+  the wrong music_context_ 
+ */
 IMPLEMENT_LISTENER (Lyric_combine_music_iterator, set_busy)
 void
 Lyric_combine_music_iterator::set_busy (SCM se)
 {
   Stream_event *e = unsmob_stream_event (se);
 
-  if (e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
-    busy_ = true;
+  if ((e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
+      && music_context_)
+    
+    busy_moment_ = max (music_context_->now_mom (),
+			busy_moment_);
+  
 }
 
 void
@@ -86,23 +97,22 @@ Lyric_combine_music_iterator::set_music_context (Context *to)
 {
   if (music_context_)
     {
-      music_context_->event_source()->remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
-      lyrics_context_->unset_property (ly_symbol2scm ("associatedVoiceContext"));
+      music_context_->event_source ()->
+	remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
     }
 
   music_context_ = to;
   if (to)
     {
-      to->event_source()->add_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
-      if (lyrics_context_)
-	lyrics_context_->set_property ("associatedVoiceContext", to->self_scm ());
+      to->event_source ()->add_listener (GET_LISTENER (set_busy),
+					 ly_symbol2scm ("music-event"));
     }
 }
 
 bool
 Lyric_combine_music_iterator::start_new_syllable () const
 {
-  if (!busy_)
+  if (busy_moment_ < music_context_->now_mom ())
     return false;
 
   if (!lyrics_context_)
@@ -201,6 +211,9 @@ IMPLEMENT_LISTENER (Lyric_combine_music_iterator, check_new_context)
 void
 Lyric_combine_music_iterator::check_new_context (SCM sev)
 {
+  if (!ok ())
+    return ;
+  
   // TODO: Check first if type=Voice and if id matches
   Stream_event * ev = unsmob_stream_event (sev);
   if (ev->get_property ("type") != ly_symbol2scm ("Voice"))
@@ -247,8 +260,10 @@ Lyric_combine_music_iterator::find_voice ()
 }
 
 void
-Lyric_combine_music_iterator::process (Moment)
+Lyric_combine_music_iterator::process (Moment when)
 {
+  (void) when;
+  
   /* see if associatedVoice has been changed */
   Context *new_voice = find_voice ();
   if (new_voice)
@@ -271,24 +286,33 @@ Lyric_combine_music_iterator::process (Moment)
 
 
   if (music_context_
-      && (start_new_syllable () || pending_grace_lyric_)
+      && (start_new_syllable () ||
+	  (busy_moment_ >= pending_grace_moment_))
       && lyric_iter_->ok ())
     {
-      if (music_context_->now_mom ().grace_part_)
+      Moment now = music_context_->now_mom ();
+      if (now.grace_part_)
 	{
-	  pending_grace_lyric_ = true;
+	  pending_grace_moment_ = now;
+	  pending_grace_moment_.grace_part_ = Rational (0);
 	  return;
 	}
       else
-	pending_grace_lyric_ = false;
+	{
+	  pending_grace_moment_.set_infinite (1);
+	}
       
       Moment m = lyric_iter_->pending_moment ();
+      lyrics_context_->set_property (ly_symbol2scm ("associatedVoiceContext"),
+				     music_context_->self_scm ());
       lyric_iter_->process (m);
 
       music_found_ = true;
     }
 
-  busy_ = false;
+  new_voice = find_voice ();
+  if (new_voice)
+    set_music_context (new_voice);
 }
 
 void