*** empty log message ***

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

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index f60632a9e8b584edadfc6858140916478dc6f892..50485ed15c1a092cd007e2a047502ee48418296a 100644 (file)
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,23 +3,67 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef PROPERTY_ITERATOR_HH
 #define PROPERTY_ITERATOR_HH
 
-#include "music-iterator.hh"
+#include "simple-music-iterator.hh"
+
+
+
+
 /**
   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_process_and_next (Moment);
+  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 process (Moment);
+};
+
+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 process (Moment);
+  virtual void do_quit();
+};
+
+class Pop_property_iterator : public Simple_music_iterator
+{
+public:
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  VIRTUAL_COPY_CONS (Music_iterator);
+protected:
+  virtual void process (Moment);
+};
+
+
 #endif // PROPERTY_ITERATOR_HH