X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=06a201f93729d34cb1744cb138a261ee5e706600;hb=6d209bd29394fe068438f602d50b8257b6f766ef;hp=c5371a2c4d2c875a8bf907b190e39e25c56a0376;hpb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index c5371a2c4d..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 <hanwen@xs4all.nl>
+                 Erik Sandberg <mandolaerik@gmail.com>
 
-  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  		 Erik Sandberg <mandolaerik@gmail.com>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "chord-tremolo-iterator.hh"
@@ -23,35 +34,24 @@ 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;
-      
-  Rational total_dur = l.main_part_;
-  Rational note_dur = total_dur / Rational (elt_count * Repeated_music::repeat_count (mus));
-
-  SCM tremolo_type = scm_int2num (note_dur.den ());
-  int expected_beaming_ = max (0, (intlog2 (total_dur.den ()) - intlog2 (total_dur.num () + 1) - 1));
 
   if (elt_count == 1)
     {
       Music *ev = make_music_by_name (ly_symbol2scm ("TremoloEvent"));
       ev->set_spot (*origin);
-      ev->set_property ("tremolo-type", tremolo_type);
+      ev->set_property ("repeat-count", mus->get_property ("repeat-count"));
+      ev->set_property ("tremolo-type", mus->get_property ("tremolo-type"));
       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);
@@ -61,8 +61,8 @@ Chord_tremolo_iterator::get_music_list () const
       Music *stop_event = unsmob_music (stop_event_scm);
       start_event->set_spot (*origin);
       stop_event->set_spot (*origin);
-      start_event->set_property ("tremolo-type", tremolo_type);
-      start_event->set_property ("expected-beam-count", scm_int2num (expected_beaming_));
+      start_event->set_property ("repeat-count", mus->get_property ("repeat-count"));
+      start_event->set_property ("tremolo-type", mus->get_property ("tremolo-type"));
 
       return scm_list_3 (start_event_scm, body->self_scm (), stop_event_scm);
     }