*** empty log message ***

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index e90054a4cff729705b0d4b779cb630fc8c5a2b54..4e54e49045b6a8e6446ba54ecf6a87c832d24070 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -3,19 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #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"
 
 /**
    ---
@@ -45,12 +43,6 @@
     * Typically this reports the music to an interpretation context,
     thus changing the state of the interpretation context.
 
-  get_pending_events (M) -- return all events starting at M (pre: no events
-    before M). No side-effects
-
-  skip (M) -- remove all events starting before M (leave the ones that
-    start M).  no side-effects on interpretation context
-
 
   TODO:
 
@@ -64,13 +56,12 @@ protected:
   Moment start_mom_;
 
   DECLARE_SMOBS (Music_iterator,dummy);
+  Music_iterator (Music_iterator const&);
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   
   Moment music_get_length () const;
   Moment music_start_mom () const;
   Music_iterator ();
-  Music_iterator (Music_iterator const&);
 
   /**
      Do the reporting.  Will try MUSIC_L_ in its own translator first,
@@ -81,24 +72,24 @@ public:
   /**
     The translation unit that we this iterator is reporting  to now.
    */
-  Translator_group* report_to () const;
+  Context * get_outlet () const;
 
-  void set_translator (Translator_group*);
+  void set_context (Context *);
   
   /** Get an iterator matching the type of MUS, and use TRANS to find
     an accompanying translation unit
    */
   static SCM get_static_get_iterator (Music * mus);
-  void init_translator (Music  *, Translator_group *); 
-void quit ();
-
-  
+  void init_translator (Music  *, Context *); 
+  void quit ();
+  void substitute_outlet (Context * from, Context *to);
+  virtual void derived_substitute (Context *, Context *);
   virtual Moment pending_moment () const;
   virtual bool ok () const;
-  virtual SCM get_pending_events (Moment until)const;
+
+  virtual bool run_always () const; 
   virtual void process (Moment until);
-  virtual void skip (Moment until);
-  virtual void derived_mark ()const;
+  virtual void derived_mark () const;
   virtual void construct_children ();
   
   /**
@@ -118,17 +109,19 @@ void quit ();
   Music * get_music () const;
 protected:
   virtual void do_quit();
+  void descend_to_child (Context*);
 private:
   Interpretation_context_handle handle_;
   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 " #Class " music iterator")\
+         "")\
 {                                              \
   SCM val = (new Class)->self_scm();   \
   scm_gc_unprotect_object (val);\