patch::: 1.3.147.jcn1

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

diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh
index 4400e458ee5b9438209c4f54e18d24c6130b8be4..21be31598990568f0b334a44a4fea46b7320863a 100644 (file)
--- a/lily/include/part-combine-music-iterator.hh
+++ b/lily/include/part-combine-music-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -18,9 +18,11 @@ public:
   VIRTUAL_COPY_CONS (Music_iterator);
   Part_combine_music_iterator ();
 
+  enum State { UNKNOWN, UNRELATED=1, SOLO1=2, SOLO2=4, UNIRHYTHM=8, UNISON=16, UNISILENCE=32, SPLIT_INTERVAL=64 };
+  static SCM constructor_cxx_function; 
 protected:
   virtual ~Part_combine_music_iterator ();
-
+  Part_combine_music_iterator (Part_combine_music_iterator const &);
   virtual void construct_children ();
   virtual Moment pending_moment () const;
   virtual void process (Moment);
@@ -30,11 +32,14 @@ protected:
 
 private:
   void change_to (Music_iterator*, String, String);
+  int get_state (Moment m);
 
   Music_iterator * first_iter_p_;
   Music_iterator * second_iter_p_;
   Moment first_until_;
   Moment second_until_;
+  int state_;
+  String suffix_;
 };
 
 #endif /* PART_COMBINE_MUSIC_ITERATOR_HH */