release: 1.3.86

[lilypond.git] / lily / include / lyric-combine-music-iterator.hh

diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
index 5ae6a43b55ea643dc3806a208a6d8972df980914..226499611007851125a2d1a1e224bd1209331c2f 100644 (file)
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -1,10 +1,10 @@
 
 /*   
-  lyric-combine-music-iterator.hh -- declare 
+  lyric-combine-music-iterator.hh -- declare Lyric_combine_music_iterator
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,13 +19,10 @@ 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);
-  virtual Music_iterator *try_music_in_children (Music const*) const;
+  virtual Music_iterator *try_music_in_children (Music *) const;
 
   virtual bool ok () const;
   virtual void do_print () const;