X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=06a201f93729d34cb1744cb138a261ee5e706600;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=e7d9d495b15bb64960e5ca9138b0180f1c45edb1;hpb=05286945fcf2083341d94fd18cf66393183ef276;p=lilypond.git diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index e7d9d495b1..06a201f937 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -1,10 +1,21 @@ /* - chord-tremolo-iterator.cc -- implement Chord_tremolo_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2012 Han-Wen Nienhuys + Erik Sandberg - (c) 2000--2009 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "chord-tremolo-iterator.hh" @@ -23,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; @@ -46,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);