X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=effa751425b7f71cb403783ed986001eb89a71eb;hb=8c83a31308b5b44c696614db2b72a0a845cc116c;hp=e6c4dd604abc8b524a758ebcfa0b17c714dcb8b1;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index e6c4dd604a..effa751425 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -1,8 +1,8 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2010 Han-Wen Nienhuys - Erik Sandberg + Copyright (C) 2000--2011 Han-Wen Nienhuys + 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 @@ -34,17 +34,11 @@ Chord_tremolo_iterator::get_music_list () const { Music *mus = get_music (); Input *origin = mus->origin (); - Moment l = mus->get_length (); Music *body = Repeated_music::body (mus); bool body_is_sequential = body->is_mus_type ("sequential-music"); int elt_count = body_is_sequential ? scm_ilength (body->get_property ("elements")) : 1; - if (body_is_sequential && - (elt_count != 2 - && elt_count != 1)) - mus->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count)); - if (elt_count <= 0) elt_count = 1; @@ -57,7 +51,7 @@ Chord_tremolo_iterator::get_music_list () const return scm_list_2 (ev->unprotect (), body->self_scm ()); } else - { + { SCM tremolo_symbol = ly_symbol2scm ("TremoloSpanEvent"); SCM start_event_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"), tremolo_symbol, scm_from_int (START)); unsmob_music (start_event_scm)->set_spot (*origin);