X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=898846e2d8db20e40be284aabfd1718f5e646992;hb=644cd97fc602c18b7e0aafdc027cb8454d62560c;hp=838156145bcbf003c9cd9dcfe431ca27cb038fa0;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 838156145b..898846e2d8 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,9 +1,9 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
 
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -12,19 +12,23 @@
 #include "note-column.hh"
 #include "pointer-group-interface.hh"
 #include "pitch.hh"
+#include "stream-event.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Cluster_spanner_engraver : public Engraver
 {
 
 protected:
   TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver);
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (cluster_note);
+  DECLARE_ACKNOWLEDGER (note_column);
+  void stop_translation_timestep ();
   virtual void process_music ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
   virtual void finalize ();
 private:
-  Link_array<Music> cluster_notes_;
+  vector<Stream_event*> cluster_notes_;
   Item *beacon_;
 
   void typeset_grobs ();
@@ -51,22 +55,25 @@ Cluster_spanner_engraver::finalize ()
 void
 Cluster_spanner_engraver::typeset_grobs ()
 {
-  finished_spanner_ = 0;
+  if (finished_spanner_)
+    {
+      if (!finished_spanner_->get_bound (RIGHT))
+	{
+	  finished_spanner_->set_bound (RIGHT,
+					finished_spanner_->get_bound (LEFT));
+					
+	}
+      
+      finished_spanner_ = 0;
+    }
   beacon_ = 0;
 }
 
-bool
-Cluster_spanner_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Cluster_spanner_engraver, cluster_note);
+void
+Cluster_spanner_engraver::listen_cluster_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("cluster-note-event"))
-    {
-      cluster_notes_.push (m);
-      return true;
-    }
-  else if (m->is_mus_type ("busy-playing-event"))
-    return cluster_notes_.size ();
-
-  return false;
+  cluster_notes_.push_back (ev);
 }
 
 void
@@ -80,7 +87,7 @@ Cluster_spanner_engraver::process_music ()
       int pmax = INT_MIN;
       int pmin = INT_MAX;
 
-      for (int i = 0; i < cluster_notes_.size (); i++)
+      for (vsize i = 0; i < cluster_notes_.size (); i++)
 	{
 	  Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
 
@@ -92,14 +99,12 @@ Cluster_spanner_engraver::process_music ()
 
       beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());
       beacon_->set_property ("positions",
-			     scm_cons (scm_int2num (pmin),
-				       scm_int2num (pmax)));
+			     scm_cons (scm_from_int (pmin),
+				       scm_from_int (pmax)));
     }
 
   if (beacon_ && !spanner_)
-    {
-      spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
-    }
+    spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
 
   if (beacon_ && spanner_)
     {
@@ -116,7 +121,7 @@ Cluster_spanner_engraver::stop_translation_timestep ()
 }
 
 void
-Cluster_spanner_engraver::acknowledge_grob (Grob_info info)
+Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
   if (!beacon_ && Note_column::has_interface (info.grob ()))
     {
@@ -125,11 +130,13 @@ Cluster_spanner_engraver::acknowledge_grob (Grob_info info)
     }
 }
 
+ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
 ADD_TRANSLATOR (Cluster_spanner_engraver,
-		/* descr */	"Engraves a cluster using Spanner notation ",
-		/* creats*/	"ClusterSpanner ClusterSpannerBeacon",
-		/* accepts */	"cluster-note-event busy-playing-event",
-		/* acks  */	"note-column-interface",
-		/* reads */	"",
+		/* doc */
+		"Engraves a cluster using Spanner notation ",
+		/* create */
+		"ClusterSpanner "
+		"ClusterSpannerBeacon ",
+		/* read */ 	"",
 		/* write */	"");