From a7ab348abcd7ace19950a2ecb5862cc246995c20 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 31 Mar 2004 10:11:01 +0000 Subject: [PATCH] (construct_children): add start_moment_ member. --- ChangeLog | 3 +++ lily/auto-change-iterator.cc | 1 - lily/part-combine-iterator.cc | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ea8cf0052..2a0f5b5239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-03-31 Han-Wen Nienhuys + * 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 69b2d890bb..852df8d287 100644 --- 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 39e3ea2ecf..a25f6a1df4 100644 --- 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_); -- 2.39.2