(construct_children): add

start_moment_ member.

diff --git a/ChangeLog b/ChangeLog
index 9ea8cf00526642bff9f4e2457177248612ef60f5..2a0f5b52398feb939287351b466be91159a63368 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-31  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/part-combine-iterator.cc (construct_children): add
+       start_moment_ member.
+
        * lily/chord-tremolo-engraver.cc (acknowledge_grob): trigger
        stem-tremolo by stem object. This fixes no stem for tremolo bug.
 

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 69b2d890bb7d48a829e6f3082c6cfd6faf05f7e7..852df8d28794a724ae3dd943fd5e236cf5170dc0 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -97,7 +97,6 @@ Auto_change_iterator::process (Moment m)
       if ((*splitm + start_moment_) > now)
        break ;
 
-      *splitm += start_moment_;
       SCM tag = gh_cdar (split_list_);
       Direction d = to_dir  (tag);
       

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 39e3ea2ecffc40a8230cf7dcf92e9457178d9660..a25f6a1df43bb5cf9e4d9ce379931ead934ab258 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -37,6 +37,7 @@ protected:
 private:
   Music_iterator * first_iter_;
   Music_iterator * second_iter_;
+  Moment start_moment_;
   
   SCM split_list_;
 
@@ -284,6 +285,7 @@ Part_combine_iterator::apart (bool silent)
 void
 Part_combine_iterator::construct_children ()
 {
+  start_moment_ = get_outlet ()->now_mom ();
   split_list_ =  get_music ()->get_property ("split-list");
   SCM lst =  get_music ()->get_property ("elements");
 
@@ -371,7 +373,7 @@ Part_combine_iterator::process (Moment m)
   for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_))
     {
       splitm = unsmob_moment (gh_caar (split_list_));
-      if (*splitm > now)
+      if (splitm && *splitm + start_moment_ > now)
        break ;
 
       SCM tag = gh_cdar (split_list_);