From: fred <fred>
Date: Tue, 26 Mar 2002 22:24:17 +0000 (+0000)
Subject: lilypond-1.1.65
X-Git-Tag: release/1.5.59~2230
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=121c67d7da5b6ab40932cc07aaeadebb9413b4a0;p=lilypond.git

lilypond-1.1.65
---

diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
index 5ae6a43b55..b8c36a8d0b 100644
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -19,9 +19,6 @@ class Lyric_combine_music_iterator : public Music_iterator
   Music_iterator * lyric_iter_p_;
   
 protected:
-  bool melisma_started_b_;
-
-  
   virtual void construct_children ();
   virtual Moment next_moment () const;
   virtual void do_process_and_next (Moment);
diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 639cbaae25..6d4cdc6bee 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -23,7 +23,6 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
   melisma_start_req.span_dir_ = START;
   melisma_stop_req.span_dir_ = STOP;
   
-  melisma_started_b_ = false;
   music_iter_p_ =0;
   lyric_iter_p_ =0;
 }
@@ -70,20 +69,21 @@ Lyric_combine_music_iterator::do_process_and_next (Moment m)
   if (busy)
     {
       bool melisma_b = try_music (&melisma_playing_req);
-      if (!melisma_started_b_ || !melisma_b)
+      if (!melisma_b)
 	{
 	  if (lyric_iter_p_->ok ())
 	    {
+#if 0				// devise a new way for this
 	      if (melisma_b && !melisma_started_b_)
 		lyric_iter_p_->try_music (&melisma_start_req);
 	      else if (melisma_started_b_)
 		lyric_iter_p_->try_music (&melisma_stop_req);
-	  
+#endif
+	      
 	      Moment m= lyric_iter_p_->next_moment ();
 	      lyric_iter_p_->process_and_next (m);
 	    }
 	}
-      melisma_started_b_ = melisma_b;
     }