release: 1.5.1

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 39919db96b759b034b66ef1526b2f92ca9dde9d8..bc99f499d3422fb3eb20cb60378729ebe977d64b 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,7 +15,7 @@
 #include "moment.hh"
 #include "virtual-methods.hh"
 #include "interpretation-context-handle.hh"
-#include "music-iterator-ctor.hh"
+#include "cxx-function-smob.hh"
 
 /** 
   Conceptually a music-iterator operates on a queue of musical events
@@ -26,10 +26,10 @@
   ok () -- events left ?
 
   pending_mom () -- time tag of the next event to be processed.
-    PRECONDITION: this->ok() holds.
+    PRECONDITION: this->ok () holds.
   
   process (M) -- process all at M (Precondition: no events exist
-    before M, this->ok() holds).  Side-effects:
+    before M, this->ok () holds).  Side-effects:
     
     * This removes all events at M from the pending queue.
 
@@ -52,11 +52,12 @@ class Music_iterator
 {
 protected:
   Moment music_length_;
-
+  Moment start_mom_;
 public:
   VIRTUAL_COPY_CONS (Music_iterator);
 
   Moment music_length_mom () const;
+  Moment music_start_mom () const;
   Music_iterator ();
   Music_iterator (Music_iterator const&);
   virtual ~Music_iterator ();
@@ -93,9 +94,6 @@ public:
   virtual void construct_children ();
   static SCM constructor_cxx_function;
   
-protected:
-  Music  * music_l_;
-
   /**
     Get an iterator for MUS, inheriting the translation unit from THIS.
    */
@@ -103,8 +101,10 @@ protected:
 
   virtual Music_iterator* try_music_in_children (Music *) const;
 
+  Music * music_l () const;
 private:
   Interpretation_context_handle handle_;
+  Music  * music_l_;
 };
 
 
@@ -120,14 +120,14 @@ Class ## _ctor (SCM)                              \
 }                                              \
 SCM Class :: constructor_cxx_function;\
 void                                           \
-Class ## _constructor_init()                           \
+Class ## _constructor_init ()                          \
 {                                              \
   SCM s = smobify_cxx_function (& Class ## _ctor);     \
   scm_permanent_object (s);\
   gh_define (#Class "::constructor", s);\
   Class :: constructor_cxx_function = s;\
 }\
-ADD_SCM_INIT_FUNC(Class ## _ctor_init, Class ## _constructor_init); 
+ADD_SCM_INIT_FUNC (Class ## _ctor_init, Class ## _constructor_init);