From: Han-Wen Nienhuys Date: Tue, 3 May 2005 16:34:59 +0000 (+0000) Subject: (consider_change_grace_settings): use X-Git-Tag: release/2.5.22~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aed34f7b1f33283fedbc6d96113c67a9126dcfd4;p=lilypond.git (consider_change_grace_settings): use is_alias(). Fixes problem with CueVoice grace notes. --- diff --git a/ChangeLog b/ChangeLog index a79688e886..59cdf41f3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-03 Han-Wen Nienhuys + * lily/grace-engraver.cc (consider_change_grace_settings): use + is_alias(). Fixes problem with CueVoice grace notes. + * lily/simultaneous-music-iterator.cc (construct_children): call Music_iterator::quit() for iterators that start out invalid. This fixes indefinitely continuing contexts. diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc index 59e2bacbbb..10b08cd1d6 100644 --- a/lily/grace-engraver.cc +++ b/lily/grace-engraver.cc @@ -69,8 +69,7 @@ Grace_engraver::consider_change_grace_settings () SCM val = scm_cadr (scm_cddr (entry)); Context *c = context (); - while (c - && c->context_name_symbol () != context_name) + while (c && !c->is_alias (context_name)) { c = c->get_parent_context (); }