X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=462a1d21fe752fd827cb3bc520cc5de8e3beb7ae;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a65ee86cbf39d72fcb0447bfe01a56c63f58ec50;hpb=1855cf7137149c0bd27b5851fd9db498385591b3;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index a65ee86cbf..462a1d21fe 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,35 +1,51 @@
 /*
-  cluster-engraver.cc -- implement Cluster_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 2002--2004 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 "item.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 *);
-  virtual void process_music ();  
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+  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_;
-  Item* beacon_;
+  vector<Stream_event *> cluster_notes_;
+  Item *beacon_;
 
   void typeset_grobs ();
   Spanner *spanner_;
-  Spanner * finished_spanner_ ;
+  Spanner *finished_spanner_;
 };
 
 Cluster_spanner_engraver::Cluster_spanner_engraver ()
@@ -51,19 +67,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;
-    }
-  return false;
+  cluster_notes_.push_back (ev);
 }
 
 void
@@ -73,31 +95,29 @@ Cluster_spanner_engraver::process_music ()
     {
       SCM c0scm = get_property ("middleCPosition");
 
-      int c0 =  ly_c_number_p (c0scm) ? ly_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_property ("pitch"));
 
-	  int p =( pit ? pit->steps () : 0) + c0;
+      for (vsize i = 0; i < cluster_notes_.size (); i++)
+        {
+          Pitch *pit = Pitch::unsmob (cluster_notes_[i]->get_property ("pitch"));
+
+          int p = (pit ? pit->steps () : 0) + c0;
+
+          pmax = max (pmax, p);
+          pmin = min (pmin, p);
+        }
 
-	  pmax = pmax >? p;
-	  pmin = 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_)
     {
       add_bound_item (spanner_, beacon_);
@@ -105,31 +125,36 @@ Cluster_spanner_engraver::process_music ()
     }
 }
 
-
 void
 Cluster_spanner_engraver::stop_translation_timestep ()
 {
   typeset_grobs ();
-
   cluster_notes_.clear ();
-  
 }
 
 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_ && Note_column::has_interface (info.grob ()))
     {
       finished_spanner_ = spanner_;
       spanner_ = 0;
     }
 }
 
-ENTER_DESCRIPTION (Cluster_spanner_engraver,
-/* descr */	"Engraves a cluster using Spanner notation ",
-/* creats*/	"ClusterSpanner ClusterSpannerBeacon",
-/* accepts */	"cluster-note-event",
-/* acks  */	"note-column-interface",
-/* reads */	"",
-/* write */	"");
+ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
+ADD_TRANSLATOR (Cluster_spanner_engraver,
+                /* doc */
+                "Engrave a cluster using @code{Spanner} notation.",
+
+                /* create */
+                "ClusterSpanner "
+                "ClusterSpannerBeacon ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );