From: Han-Wen Nienhuys Date: Wed, 31 Mar 2004 12:05:39 +0000 (+0000) Subject: (process): use find_existing_context(). X-Git-Tag: release/2.1.37~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a4cf90a1ba3e5e580b83d1ce6fa1b0d75b33eb2e;p=lilypond.git (process): use find_existing_context(). --- diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely index 6c7019e594..749231594e 100644 --- a/Documentation/user/preface.itely +++ b/Documentation/user/preface.itely @@ -48,6 +48,10 @@ Han-Wen and Jan Utrecht/Eindhoven, The Netherlands, July 2002. +@menu +* Notes to version 2.2:: +@end menu + @node Notes to version 2.2 @unnumberedsec Notes to version 2.2 diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index 829ca048a4..ebd3426ac0 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -65,9 +65,16 @@ Change_iterator::process (Moment m) if (last) { Context * dest = - get_outlet ()->find_existing_context (to_type, to_id, SCM_EOL); + get_outlet ()->find_existing_context (to_type, to_id); + if (dest) + { current->remove_context (last); dest->add_context (last); + } + else + { + get_music ()->origin ()->warning ("Could not find context to switch to."); + } } else { diff --git a/lily/parser.yy b/lily/parser.yy index f02b425f89..2261524405 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -812,7 +812,7 @@ Repeated_music: if (list_len != 2) seq->origin ()->warning ("Chord tremolo must have 2 elements."); shift -= 1; - r->compress (Moment (Rational (1,list_len))); + r->compress (Moment (Rational (1, list_len))); } gh_call3 (func, r->self_scm (), gh_int2scm (shift),gh_int2scm (dots));