X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=e8ba45121229d414c83e0449ef07a5d2bd9b322d;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=cdbfcd9b5dd72328c7bd49afb54b49d65ad85e2a;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index cdbfcd9b5d..e8ba451212 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,29 +1,46 @@
 /*
-  cluster-engraver.cc -- implement Cluster_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
 #include "spanner.hh"
 #include "note-head.hh"
 #include "note-column.hh"
-#include "group-interface.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 listen_cluster_note (Stream_event *);
+  void acknowledge_note_column (Grob_info);
+  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 ();
@@ -31,7 +48,8 @@ private:
   Spanner *finished_spanner_;
 };
 
-Cluster_spanner_engraver::Cluster_spanner_engraver ()
+Cluster_spanner_engraver::Cluster_spanner_engraver (Context *c)
+  : Engraver (c)
 {
   spanner_ = 0;
   finished_spanner_ = 0;
@@ -50,22 +68,24 @@ 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)
+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
@@ -79,26 +99,24 @@ Cluster_spanner_engraver::process_music ()
       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"));
+      for (vsize i = 0; i < cluster_notes_.size (); i++)
+        {
+          Pitch *pit = unsmob<Pitch> (cluster_notes_[i]->get_property ("pitch"));
 
-	  int p = (pit ? pit->steps () : 0) + c0;
+          int p = (pit ? pit->steps () : 0) + c0;
 
-	  pmax = pmax >? p;
-	  pmin = pmin <? p;
-	}
+          pmax = max (pmax, p);
+          pmin = min (pmin, p);
+        }
 
       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_)
     {
@@ -115,20 +133,34 @@ 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_))
+  if (!beacon_ && has_interface<Note_column> (info.grob ()))
     {
       finished_spanner_ = spanner_;
       spanner_ = 0;
     }
 }
 
+void
+Cluster_spanner_engraver::boot ()
+{
+  ADD_LISTENER (Cluster_spanner_engraver, cluster_note);
+  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 */	"",
-		/* write */	"");
+                /* doc */
+                "Engrave a cluster using @code{Spanner} notation.",
+
+                /* create */
+                "ClusterSpanner "
+                "ClusterSpannerBeacon ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );