Run `make grand-replace'.

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 0b738aa0b338569bf7409d3a04c4606c6650a963..86b3bf379a0127d8dd1b300e9b608f1e2971dc15 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_ITERATOR_HH
@@ -54,20 +54,21 @@ protected:
   Moment start_mom_;
 
   DECLARE_CLASSNAME(Music_iterator);
-  DECLARE_SMOBS (Music_iterator, dummy);
+  DECLARE_SMOBS (Music_iterator);
   Music_iterator (Music_iterator const &);
 
 public:
   Moment music_get_length () const;
   Moment music_start_mom () const;
   Music_iterator ();
-  Music_iterator *try_music (Music *) const;
+  void report_event (Music *);
   Context *get_outlet () const;
   void set_context (Context *);
   static SCM get_static_get_iterator (Music *mus);
-  void init_translator (Music *, Context *);
+  void init_context (Music *, Context *);
   void quit ();
   void substitute_outlet (Context *from, Context *to);
+  void descend_to_bottom_context ();
   virtual void derived_substitute (Context *, Context *);
   virtual Moment pending_moment () const;
   virtual bool ok () const;
@@ -78,8 +79,6 @@ public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   SCM get_iterator (Music *) const;
 
-  virtual Music_iterator *try_music_in_children (Music *) const;
-
   Music *get_music () const;
 protected:
   virtual void do_quit ();