From 292dd3b29fe107252e73b6fe7dacfda22c552e09 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 19 Sep 2006 22:47:40 +0000 Subject: [PATCH] (process_music): also set tieMelismaBusy if event_ detected. --- ChangeLog | 3 +++ lily/tie-engraver.cc | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18678e2a5b..5668f46af9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-09-20 Han-Wen Nienhuys + * lily/tie-engraver.cc (process_music): also set tieMelismaBusy if + event_ detected. + * scm/script.scm (default-script-alist): avoid-slur and slur-padding for portato script. diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index f08e5e5d6c..9547d14025 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -94,13 +94,13 @@ Tie_engraver::listen_tie (Stream_event *ev) void Tie_engraver::process_music () { - for (vsize i = 0; i < heads_to_tie_.size (); i++) - if (heads_to_tie_[i].tie_event_ - || heads_to_tie_[i].tie_stream_event_) - { - context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); - break; - } + bool busy = event_; + for (vsize i = 0; !busy && i < heads_to_tie_.size (); i++) + busy |= (heads_to_tie_[i].tie_event_ + || heads_to_tie_[i].tie_stream_event_); + + if (busy) + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } void -- 2.39.5