patch::: 1.3.141.hwn3: Re: Sugar

[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 eada524f8048086bfafbe1ab68fea3606f8ca459..dae14c81dcbf2b159cecd4e7952370c21dbd97b1 100644 (file)
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -18,15 +18,15 @@ class Lyric_combine_music_iterator : public Music_iterator
 public:
   VIRTUAL_COPY_CONS (Music_iterator);
   Lyric_combine_music_iterator ();
-
+  Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
+  static SCM constructor_cxx_function;
 protected:
   virtual void construct_children ();
-  virtual Moment next_moment () const;
-  virtual void do_process (Moment);
+  virtual Moment pending_moment () const;
+  virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
 
   virtual bool ok () const;
-  virtual void do_print () const;
   virtual ~Lyric_combine_music_iterator ();
 
 private: