* lily/tuplet-bracket.cc (calc_position_and_height): check musical

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

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index 7591fce27748d4e7e510af6bf88ec8a510031741..52048ac5959a37366f443ae1e308cc8a95099fea 100644 (file)
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef PROPERTY_ITERATOR_HH
 #define PROPERTY_ITERATOR_HH
 
-#include "music-iterator.hh"
+#include "simple-music-iterator.hh"
 
 
 
@@ -18,24 +18,51 @@
 /**
   Iterate a property.  
  */
-class Property_iterator : public Music_iterator
+class Property_iterator : public Simple_music_iterator
 {
 public:
-  // construction  
+  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK(once_finalization, (SCM, SCM ));
+
+protected:
+  virtual void do_quit();
+  virtual void process (Moment);
+};
+
+
+
+
+/**
+  Iterate a property.  
+ */
+class Property_unset_iterator : public Simple_music_iterator
+{
+public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 protected:
-  virtual void do_process_and_next (Moment);
+  virtual void process (Moment);
 };
 
-class Push_property_iterator : public Music_iterator
+class Push_property_iterator : public Simple_music_iterator
 {
+public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());  
+  DECLARE_SCHEME_CALLBACK(once_finalization, (SCM, SCM));
 protected:
-  virtual void do_process_and_next (Moment);
+  virtual void process (Moment);
+  virtual void do_quit();
 };
 
-class Pop_property_iterator : public Music_iterator
+class Pop_property_iterator : public Simple_music_iterator
 {
+public:
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  VIRTUAL_COPY_CONS (Music_iterator);
 protected:
-  virtual void do_process_and_next (Moment);
+  virtual void process (Moment);
 };