release: 1.1.43

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

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index e2c1eb4ee6ff405b086a7ce6b3ac0a4c733c91f9..a04f3f221605ff257ad9d7b227389cc32ecf6721 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,18 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef SIMULTANEOUS_MUSIC_ITERATOR_HH
 #define SIMULTANEOUS_MUSIC_ITERATOR_HH
 
+#include "cons.hh"
 #include "music-list-iterator.hh"
 
 class Simultaneous_music_iterator : public Music_list_iterator
 {
 public:
+
+  /// make a new context for every child.
+  bool separate_contexts_b_;
+  
   Simultaneous_music_iterator ();
   virtual ~Simultaneous_music_iterator ();
 
@@ -23,13 +28,11 @@ public:
   virtual bool ok () const;
 
 protected:
-  Simultaneous_music* simultaneous_music_l () const;
-
   virtual void do_print () const;
   virtual void do_process_and_next (Moment);
 
 private:
-  Pointer_list<Music_iterator*> children_p_list_;
+  Cons_list<Music_iterator> children_p_list_;
 };
 
 #endif // SIMULTANEOUS_MUSIC_ITERATOR_HH