(set_spacing_rods): new

[lilypond.git] / lily / cluster-engraver.cc

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index a58a5f57b1a258a5bb09b94723283c9392fcf3a4..ec65f0ef386140316958654907e6d71705b5fabf 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,13 +1,12 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2003 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"
@@ -17,7 +16,7 @@ class Cluster_spanner_engraver : public Engraver
 {
 
 protected:
-  TRANSLATOR_DECLARATIONS(Cluster_spanner_engraver);
+  TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver);
   virtual bool try_music (Music *);
   virtual void process_music ();  
   virtual void acknowledge_grob (Grob_info);
@@ -29,7 +28,7 @@ private:
 
   void typeset_grobs ();
   Spanner *spanner_;
-  Spanner * finished_spanner_ ;
+  Spanner *finished_spanner_ ;
 };
 
 Cluster_spanner_engraver::Cluster_spanner_engraver ()
@@ -51,52 +50,38 @@ Cluster_spanner_engraver::finalize ()
 void
 Cluster_spanner_engraver::typeset_grobs ()
 {
-  if (finished_spanner_ )
-    {
-      typeset_grob (finished_spanner_);
-      finished_spanner_ = 0;
-    }
-
-  if (beacon_)
-    {
-      typeset_grob (beacon_);
-      beacon_ = 0;
-    }
+  finished_spanner_ = 0;
+  beacon_ = 0;
 }
 
 bool
 Cluster_spanner_engraver::try_music (Music *m)
 {
-  if (m->is_mus_type ("abort-event"))
-    {
-      if (spanner_)
-       {
-         spanner_->suicide ();
-         spanner_ = 0;
-       }
-    }
-  else if (m->is_mus_type ("cluster-note-event"))
+  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;
 }
 
 void
 Cluster_spanner_engraver::process_music ()
 {
-  if (cluster_notes_.size())
+  if (cluster_notes_.size ())
     {
-      SCM c0scm = get_property ("centralCPosition");
+      SCM c0scm = get_property ("middleCPosition");
 
-      int c0 =  gh_number_p (c0scm) ? gh_scm2int (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_mus_property ("pitch"));
+         Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
 
          int p =( pit ? pit->steps () : 0) + c0;
 
@@ -104,17 +89,15 @@ Cluster_spanner_engraver::process_music ()
          pmin = pmin <? p;
        }
       
-      beacon_ = make_item ("ClusterSpannerBeacon");
-      beacon_->set_grob_property ("positions",
-                                 scm_cons (gh_int2scm (pmin),
-                                           gh_int2scm (pmax)));
-      announce_grob (beacon_, cluster_notes_[0]->self_scm ());
+      beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());
+      beacon_->set_property ("positions",
+                                 scm_cons (scm_int2num (pmin),
+                                           scm_int2num (pmax)));
     }
 
   if (beacon_ && !spanner_)
     {    
-      spanner_ = make_spanner ("ClusterSpanner");
-      announce_grob (spanner_, cluster_notes_[0]->self_scm ());
+      spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm () );
     }
   
   if (beacon_ && spanner_)
@@ -129,9 +112,7 @@ void
 Cluster_spanner_engraver::stop_translation_timestep ()
 {
   typeset_grobs ();
-
-  cluster_notes_.clear();
-  
+  cluster_notes_.clear ();
 }
 
 void
@@ -144,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 abort-event",
+/* accepts */  "cluster-note-event busy-playing-event",
 /* acks  */    "note-column-interface",
 /* reads */    "",
 /* write */    "");