Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 2440ae8d996d37d9d0364db7d9181620af8a4c98..3c62205b90ce396359dd2d6ee75d66d883ac98be 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -61,13 +61,14 @@ 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 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 ();
@@ -93,7 +92,8 @@ private:
 bool is_child_context (Context *me, Context *child);
 
 #define IMPLEMENT_CTOR_CALLBACK(Class)                                 \
-  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, #Class "::constructor", \
+  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, \
+                            mangle_cxx_identifier (string (#Class) + "::constructor").c_str(), \
                             0, 0, 0,                                   \
                             (),                                        \
                             "")                                        \