* scm/framework-ps.scm (output-variables): separately scale the

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 14f4aad5d15ff7ab9958773dc8025493a1eb4fc7..c5fdfe912c99cf3b855008cb8fd23e09a605c896 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -10,12 +10,10 @@
 #ifndef MUSIC_ITERATOR_HH
 #define MUSIC_ITERATOR_HH
 
-#include "lily-proto.hh"
 #include "array.hh"
 #include "moment.hh"
 #include "virtual-methods.hh"
 #include "interpretation-context-handle.hh"
-#include "smobs.hh"
 
 /**
    ---
@@ -76,7 +74,7 @@ public:
    */
   Context * get_outlet () const;
 
-  void set_translator (Context *);
+  void set_context (Context *);
   
   /** Get an iterator matching the type of MUS, and use TRANS to find
     an accompanying translation unit
@@ -91,7 +89,7 @@ public:
 
   virtual bool run_always () const; 
   virtual void process (Moment until);
-  virtual void derived_mark ()const;
+  virtual void derived_mark () const;
   virtual void construct_children ();
   
   /**
@@ -117,12 +115,13 @@ private:
   Music  * music_;
 };
 
+bool is_child_context (Context *me, Context *child);
 
 #define IMPLEMENT_CTOR_CALLBACK(Class)         \
 LY_DEFINE_MEMBER_FUNCTION(Class,constructor, #Class "::constructor",\
          0,0,0,\
          (),\
-         "Construct a @code{" #Class "} music iterator")\
+         "")\
 {                                              \
   SCM val = (new Class)->self_scm();   \
   scm_gc_unprotect_object (val);\