release: 1.0.1

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 352af5f3799194511c3ee3d264712b604927ad22..f5e04126f86630e76c5f251510c5a7fa6db13f78 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,34 +12,39 @@
 
 #include "lily-proto.hh"
 #include "plist.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "moment.hh"
 #include "virtual-methods.hh"
 
 class Music_iterator {
-  Array<Translator *>report_to_l_arr_;
-  void push_translator (Translator*);
+  Array<Translator_group*>report_to_l_arr_;
+  void push_translator (Translator_group*);
   void pop_translator();
 protected:
   bool first_b_;
   virtual void do_print() const;
     
-  virtual Translator * get_req_translator_l();
+  virtual Translator_group* get_req_translator_l();
   Music_iterator* get_iterator_p (Music*) const;
-  void set_translator (Translator*);
+  void set_translator (Translator_group*);
   Music_iterator *daddy_iter_l_;
     
 public:
-  Translator *report_to_l() const;
+  Translator_group*report_to_l() const;
   DECLARE_MY_RUNTIME_TYPEINFO;
  
-  static Music_iterator* static_get_iterator_p (Music*,Translator*);
+  static Music_iterator* static_get_iterator_p (Music*,Translator_group*);
   Music_iterator();
     
   virtual void process_and_next (Moment until);
   virtual Moment next_moment() const;
   virtual bool ok() const;
   virtual ~Music_iterator();
+
+  /**
+    Construct sub-iterators, and set the translator to 
+    report to
+   */
   virtual void construct_children();
   void print() const;
 };