X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=191e92ac275fe5ed3dd9bfd8a2dfed4f13a630da;hb=d806ead3005e3d85e8fce5ba8227600341a50b12;hp=fd456b6ac3cb1aab4e1d79b2560ebfb0be4622b4;hpb=9f3df01392cdaf8120bf67c5034e507242be90e7;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index fd456b6ac3..191e92ac27 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,94 +1,71 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
+/*
+  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>
-  
- */
 
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  		 Erik Sandberg <mandolaerik@gmail.com>
+*/
 
-/*
-  this is culled from various other iterators, but sharing code by
-  subclassing proved to be too difficult.
- */
+#include "chord-tremolo-iterator.hh"
 
 #include "input.hh"
-#include "chord-tremolo-iterator.hh"
+#include "international.hh"
+#include "misc.hh"
 #include "repeated-music.hh"
 
-void
-Chord_tremolo_iterator::construct_children ()
-{
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (get_music ());
-  factor_  = Moment (Rational(1, 1));
-  child_iter_ = unsmob_iterator (get_iterator (rep->body ()));
-}
-
 Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
-  factor_ = 1;
-  child_iter_ = 0;
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
+SCM
+Chord_tremolo_iterator::get_music_list () const
 {
-  factor_ = src.factor_;
-  child_iter_ = 0;
-  if (src.child_iter_)
-    {
-      child_iter_ = src.child_iter_->clone ();
-      scm_gc_unprotect_object (child_iter_->self_scm());
-    }
-}
+  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");
 
-void
-Chord_tremolo_iterator::do_quit()
-{
-  if (child_iter_)
-    child_iter_->quit();
-}
+  int elt_count = body_is_sequential ? scm_ilength (body->get_property ("elements")) : 1;
 
-void
-Chord_tremolo_iterator::derived_mark () const
-{
-  if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm());
-}
+  if (body_is_sequential &&
+      (elt_count != 2
+       && elt_count != 1))
+    mus->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
 
-void
-Chord_tremolo_iterator::process (Moment m)
-{
-  if (!m.to_bool () )
-    {
-      Music_iterator *yeah = try_music (get_music ());
-      if (yeah)
-	set_translator (yeah->report_to ());
-      else
-	get_music ()->origin ()->warning (_ ("no one to print a tremolos"));
-    }
+  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));
 
-  child_iter_->process (factor_ * m);
-}
+  SCM tremolo_type = scm_int2num (note_dur.den ());
+  int expected_beaming_ = max (0, (intlog2 (total_dur.den ()) - intlog2 (total_dur.num () + 1) - 1));
 
-Moment
-Chord_tremolo_iterator::pending_moment () const
-{
-  return child_iter_->pending_moment () / factor_;
-}
+  if (elt_count == 1)
+    {
+      Music *ev = make_music_by_name (ly_symbol2scm ("TremoloEvent"));
+      ev->set_spot (*origin);
+      ev->set_property ("tremolo-type", 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));
 
-bool
-Chord_tremolo_iterator::ok () const
-{
-  return child_iter_ && child_iter_->ok ();
-}
+      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 ("tremolo-type", tremolo_type);
+      start_event->set_property ("expected-beam-count", scm_int2num (expected_beaming_));
 
-Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music  *m) const
-{
-  return child_iter_->try_music (m);
+      return scm_list_3 (start_event_scm, body->self_scm (), stop_event_scm);
+    }
 }
 
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);
-