Merge with master

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

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index ccd52d3dd2e0bee9942bc4fcfd46d2aa5dcd4d14..e5ed481f6a53d8e32820f4d96ff4ac424717291f 100644 (file)
--- 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 *);
-  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (cluster_note);
   DECLARE_ACKNOWLEDGER (note_column);
   void stop_translation_timestep ();
+  virtual void process_music ();
   virtual void finalize ();
 private:
-  Link_array<Music> cluster_notes_;
+  vector<Stream_event*> cluster_notes_;
   Item *beacon_;
 
   void typeset_grobs ();
@@ -55,18 +59,11 @@ Cluster_spanner_engraver::typeset_grobs ()
   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 +77,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"));
 
@@ -97,9 +94,7 @@ Cluster_spanner_engraver::process_music ()
     }
 
   if (beacon_ && !spanner_)
-    {
-      spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
-    }
+    spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
 
   if (beacon_ && spanner_)
     {
@@ -125,13 +120,13 @@ Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
     }
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
 ADD_TRANSLATOR (Cluster_spanner_engraver,
-               /* doc */       "Engraves a cluster using Spanner notation ",
-               /* create */    "ClusterSpanner ClusterSpannerBeacon",
-               /* accept */    "cluster-note-event busy-playing-event",
+               /* doc */
+               "Engraves a cluster using Spanner notation ",
+               /* create */
+               "ClusterSpanner "
+               "ClusterSpannerBeacon ",
                /* read */      "",
                /* write */     "");