X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcluster-engraver.cc;h=faac5f79d0c90c5e66e82cbc0f9c41aa089f9c77;hb=9e752ec70a160d6c3d7632036de75630438c4142;hp=eff1695eb33ea68864ccc8c16d25c8fc54e1d45d;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index eff1695eb3..faac5f79d0 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--2006 Juergen Reuter <reuter@ipd.uka.de>
 
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -20,11 +20,11 @@ protected:
   TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver);
   virtual bool try_music (Music *);
   void process_music ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
   virtual void finalize ();
 private:
-  Link_array<Music> cluster_notes_;
+  vector<Music*> cluster_notes_;
   Item *beacon_;
 
   void typeset_grobs ();
@@ -60,7 +60,7 @@ Cluster_spanner_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("cluster-note-event"))
     {
-      cluster_notes_.push (m);
+      cluster_notes_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
@@ -80,7 +80,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 +92,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_)
     {
@@ -127,11 +125,11 @@ Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Cluster_spanner_engraver, note_column);
+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",
-		/* reads */	"",
+		/* doc */ 	"Engraves a cluster using Spanner notation ",
+		/* create */ 	"ClusterSpanner ClusterSpannerBeacon",
+		/* accept */ 	"cluster-note-event busy-playing-event",
+		/* read */ 	"",
 		/* write */	"");