X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=ec65f0ef386140316958654907e6d71705b5fabf;hb=7dfc156191e71a9ef2a989fc0441c009cd47f2bc;hp=9e10915541eeed205ac8fea5eb8ea6cbd12b3660;hpb=e53b6ddc057f5419b4bc6219f0cf6132a487a305;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 9e10915541..ec65f0ef38 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,13 +1,12 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "spanner.hh"
 #include "note-head.hh"
 #include "note-column.hh"
@@ -29,7 +28,7 @@ private:
 
   void typeset_grobs ();
   Spanner *spanner_;
-  Spanner * finished_spanner_ ;
+  Spanner *finished_spanner_ ;
 };
 
 Cluster_spanner_engraver::Cluster_spanner_engraver ()
@@ -63,6 +62,9 @@ Cluster_spanner_engraver::try_music (Music *m)
       cluster_notes_.push (m);
       return true;
     }
+  else if (m->is_mus_type ("busy-playing-event"))
+    return cluster_notes_.size ();
+  
   return false;
 }
 
@@ -73,13 +75,13 @@ Cluster_spanner_engraver::process_music ()
     {
       SCM c0scm = get_property ("middleCPosition");
 
-      int c0 =  ly_c_number_p (c0scm) ? scm_to_int (c0scm) : 0;
+      int c0 =  scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
       int pmax = INT_MIN;
       int pmin = INT_MAX;
       
       for (int i = 0; i <cluster_notes_.size (); i++)
 	{
-	  Pitch *pit =unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
+	  Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
 
 	  int p =( pit ? pit->steps () : 0) + c0;
 
@@ -110,9 +112,7 @@ void
 Cluster_spanner_engraver::stop_translation_timestep ()
 {
   typeset_grobs ();
-
   cluster_notes_.clear ();
-  
 }
 
 void
@@ -125,10 +125,10 @@ Cluster_spanner_engraver::acknowledge_grob (Grob_info info)
     }
 }
 
-ENTER_DESCRIPTION (Cluster_spanner_engraver,
+ADD_TRANSLATOR (Cluster_spanner_engraver,
 /* descr */	"Engraves a cluster using Spanner notation ",
 /* creats*/	"ClusterSpanner ClusterSpannerBeacon",
-/* accepts */	"cluster-note-event",
+/* accepts */	"cluster-note-event busy-playing-event",
 /* acks  */	"note-column-interface",
 /* reads */	"",
 /* write */	"");