X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event.cc;h=24a022b4c969ec2427953e503e9172568189c2b7;hb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;hp=117559b87c52871bca8d5739b22f1dcf122265c6;hpb=25e22b5ae7e6c1c5a8ffa82fd8217909ef3fa124;p=lilypond.git diff --git a/lily/stream-event.cc b/lily/stream-event.cc index 117559b87c..24a022b4c9 100644 --- a/lily/stream-event.cc +++ b/lily/stream-event.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2012 Erik Sandberg + Copyright (C) 2005--2014 Erik Sandberg LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -69,7 +69,6 @@ bool Stream_event::internal_in_event_class (SCM class_name) { SCM cl = get_property ("class"); - cl = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), cl); return scm_c_memq (class_name, cl) != SCM_BOOL_F; } @@ -89,16 +88,15 @@ Stream_event::make_transposable () SCM val = scm_cdr (entry); if ((unsmob_pitch (val) - || (prop == ly_symbol2scm ("element") && unsmob_music (val)) - || (prop == ly_symbol2scm ("elements") && scm_is_pair (val)) - || (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val))) - && scm_is_false (scm_assq (prop, mutable_property_alist_))) - mutable_property_alist_ = - scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_); + || (prop == ly_symbol2scm ("element") && unsmob_music (val)) + || (prop == ly_symbol2scm ("elements") && scm_is_pair (val)) + || (prop == ly_symbol2scm ("pitch-alist") && scm_is_pair (val))) + && scm_is_false (scm_assq (prop, mutable_property_alist_))) + mutable_property_alist_ + = scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_); } } - SCM Stream_event::dump (SCM self) {