2003 -> 2004

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index e90054a4cff729705b0d4b779cb630fc8c5a2b54..7d7c5eef2a459c1f7679a442fd981ee523d639f2 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -45,12 +45,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 +58,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,7 +74,7 @@ public:
   /**
     The translation unit that we this iterator is reporting  to now.
    */
-  Translator_group* report_to () const;
+  Translator_group* get_outlet () const;
 
   void set_translator (Translator_group*);
   
@@ -90,14 +83,14 @@ public:
    */
   static SCM get_static_get_iterator (Music * mus);
   void init_translator (Music  *, Translator_group *); 
-void quit ();
-
-  
+  void quit ();
+  void substitute_outlet (Translator_group* from, Translator_group *to);
+  virtual void derived_substitute (Translator_group*, Translator_group*);
   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 construct_children ();
   
@@ -128,7 +121,7 @@ private:
 LY_DEFINE_MEMBER_FUNCTION(Class,constructor, #Class "::constructor",\
          0,0,0,\
          (),\
-         "Construct a " #Class " music iterator")\
+         "Construct a @code{" #Class "} music iterator")\
 {                                              \
   SCM val = (new Class)->self_scm();   \
   scm_gc_unprotect_object (val);\