X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=a01c1aa9c1d276ca940b596a8709d8cae2bc7ba3;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=e3364847d0a2a36f562a7641b4943618ebffc990;hpb=8e7c61da2807da363e25c2d80bd0d69616dadea8;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index e3364847d0..a01c1aa9c1 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,82 +1,71 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-
 /*
-  this is culled from various other iterators, but sharing code by
-  subclassing proved to be too difficult.
- */
-
-#include "input.hh"
-#include "chord-tremolo-iterator.hh"
-#include "repeated-music.hh"
+  This file is part of LilyPond, the GNU music typesetter.
 
-void
-Chord_tremolo_iterator::construct_children ()
-{
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l ());
-  factor_  = Moment (Rational(1, 1));
-  child_iter_p_ = get_iterator_p (rep->body ());
-}
+  Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+                 Erik Sandberg <mandolaerik@gmail.com>
 
-Chord_tremolo_iterator::Chord_tremolo_iterator ()
-{
-  factor_ = 1;
-  child_iter_p_ = 0;
-}
+  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.
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
-{
-  factor_ = src.factor_;
-  child_iter_p_ = src.child_iter_p_ ? src.child_iter_p_->clone () : 0; 
-}
+  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.
 
-void
-Chord_tremolo_iterator::process (Moment m)
-{
-  if (!m.to_bool () )
-    {
-      Music_iterator *yeah = try_music (music_l ());
-      if (yeah)
-	set_translator (yeah->report_to_l ());
-      else
-	music_l ()->origin ()->warning (_ ("no one to print a tremolos"));
-    }
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  child_iter_p_->process (factor_ * m);
-}
+#include "chord-tremolo-iterator.hh"
 
-Moment
-Chord_tremolo_iterator::pending_moment () const
-{
-  return child_iter_p_->pending_moment () / factor_;
-}
+#include "input.hh"
+#include "international.hh"
+#include "misc.hh"
+#include "repeated-music.hh"
 
-bool
-Chord_tremolo_iterator::ok () const
+Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
-  return child_iter_p_ && child_iter_p_->ok ();
 }
 
-Chord_tremolo_iterator::~Chord_tremolo_iterator ()
+SCM
+Chord_tremolo_iterator::get_music_list () const
 {
-  delete child_iter_p_;
-}
+  Music *mus = get_music ();
+  Input *origin = mus->origin ();
+  Music *body = Repeated_music::body (mus);
+  bool body_is_sequential = body->is_mus_type ("sequential-music");
 
-Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music  *m) const
-{
-  return child_iter_p_->try_music (m);
-}
+  int elt_count = body_is_sequential ? scm_ilength (body->get_property ("elements")) : 1;
 
+  if (elt_count <= 0)
+    elt_count = 1;
 
+  if (elt_count == 1)
+    {
+      Music *ev = make_music_by_name (ly_symbol2scm ("TremoloEvent"));
+      ev->set_spot (*origin);
+      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);
+      SCM stop_event_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"), tremolo_symbol, scm_from_int (STOP));
+
+      Music *start_event = unsmob_music (start_event_scm);
+      Music *stop_event = unsmob_music (stop_event_scm);
+      start_event->set_spot (*origin);
+      stop_event->set_spot (*origin);
+      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);
+    }
+}
 
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);
-