lilypond-1.1.65

diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
index 5ae6a43b55ea643dc3806a208a6d8972df980914..b8c36a8d0b01afca9aef6c0e88d6d60dfeb9aab9 100644 (file)
--- 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 639cbaae25e61e17b9b3f156a77f518633bef6ea..6d4cdc6bee322b6f0d84151f0f8a6a86ee352af4 100644 (file)
--- 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;
     }