X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=5ae931f3d98ce3b22dac6ea3e671c5d5d1b9c198;hb=04ae3a59a98ccdfa95db5664c88223a5805dc3db;hp=a9bd545314797a19250c787e68f401c8d4b67a70;hpb=caa5cbed9daa027989b8d0e7d88fdf27ff5145ef;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index a9bd545314..5ae931f3d9 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,188 +1,146 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2004 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 "warn.hh"
+#include "note-column.hh"
+#include "group-interface.hh"
 
-class Cluster_engraver : public Engraver
+class Cluster_spanner_engraver : public Engraver
 {
 
 protected:
-TRANSLATOR_DECLARATIONS(Cluster_engraver);
-  virtual void start_translation_timestep ();
+  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 ();
-
+  virtual void finalize ();
 private:
-  Drul_array<Music*> reqs_drul_;
-  Pitch pitch_min, pitch_max;
-  Spanner *cluster;
-  SCM columns_scm;
+  Link_array<Music> cluster_notes_;
+  Item* beacon_;
+
+  void typeset_grobs ();
+  Spanner *spanner_;
+  Spanner * finished_spanner_ ;
 };
 
-void reset_min_max (Pitch *pitch_min, Pitch *pitch_max)
+Cluster_spanner_engraver::Cluster_spanner_engraver ()
 {
-  /*
-   * (pitch_min > pitch_max) means that pitches are not yet
-   * initialized
-   */
-  *pitch_min = Pitch (0, 0, +1);
-  *pitch_max = Pitch (0, 0, -1);
+  spanner_ = 0;
+  finished_spanner_ = 0;
+  beacon_ = 0;
 }
 
-Cluster_engraver::Cluster_engraver ()
+void
+Cluster_spanner_engraver::finalize ()
 {
-  cluster = 0;
-  columns_scm = SCM_EOL;
-  reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0;
+  typeset_grobs ();
+  finished_spanner_ = spanner_;
+  spanner_ = 0;
+  typeset_grobs ();
 }
 
-bool
-Cluster_engraver::try_music (Music *m)
+void
+Cluster_spanner_engraver::typeset_grobs ()
 {
-  if (m->is_mus_type ("abort-event"))
+  if (finished_spanner_ )
     {
-      reqs_drul_[START] = 0;
-      reqs_drul_[STOP] = 0;
-      if (cluster)
-	{
-	  cluster->suicide ();
-	  cluster = 0;
-	  columns_scm = SCM_EOL;
-	}
+      typeset_grob (finished_spanner_);
+      finished_spanner_ = 0;
+    }
+
+  if (beacon_)
+    {
+      typeset_grob (beacon_);
+      beacon_ = 0;
     }
-  else if (m->is_mus_type ("cluster-event"))
+}
+
+bool
+Cluster_spanner_engraver::try_music (Music *m)
+{
+  if (m->is_mus_type ("cluster-note-event"))
     {
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
-      reqs_drul_[d] = m;
+      cluster_notes_.push (m);
       return true;
     }
   return false;
 }
 
 void
-Cluster_engraver::process_music ()
+Cluster_spanner_engraver::process_music ()
 {
-  if (reqs_drul_[STOP])
+  if (cluster_notes_.size ())
     {
-      if (!cluster)
-	{
-	  reqs_drul_[STOP]->origin ()->warning ("can't find start of cluster");
-	}
-      else
+      SCM c0scm = get_property ("middleCPosition");
+
+      int c0 =  gh_number_p (c0scm) ? gh_scm2int (c0scm) : 0;
+      int pmax = INT_MIN;
+      int pmin = INT_MAX;
+      
+      for (int i = 0; i <cluster_notes_.size (); i++)
 	{
-	  Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
-	  cluster->set_bound (RIGHT, bound);
-	  cluster->set_grob_property ("segments", columns_scm);
-	  typeset_grob (cluster);
-	  cluster = 0;
-	  columns_scm = SCM_EOL;
+	  Pitch *pit =unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
+
+	  int p =( pit ? pit->steps () : 0) + c0;
+
+	  pmax = pmax >? p;
+	  pmin = pmin <? p;
 	}
-      reqs_drul_[STOP] = 0;
+      
+      beacon_ = make_item ("ClusterSpannerBeacon");
+      beacon_->set_property ("positions",
+				  scm_cons (gh_int2scm (pmin),
+					    gh_int2scm (pmax)));
+      announce_grob (beacon_, cluster_notes_[0]->self_scm ());
     }
-  if (reqs_drul_[START])
+
+  if (beacon_ && !spanner_)
+    {    
+      spanner_ = make_spanner ("ClusterSpanner");
+      announce_grob (spanner_, cluster_notes_[0]->self_scm ());
+    }
+  
+  if (beacon_ && spanner_)
     {
-      if (cluster)
-	{
-	  reqs_drul_[START]->origin ()->warning ("may not nest clusters");
-	}
-      else
-	{
-	  SCM basicProperties = get_property ("Cluster");
-	  cluster = new Spanner (basicProperties);
-	  columns_scm = SCM_EOL;
-	  Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
-	  cluster->set_bound (LEFT, bound);
-	  announce_grob (cluster, bound->self_scm ());
-	}
-      reqs_drul_[START] = 0;
+      add_bound_item (spanner_, beacon_);
+      Pointer_group_interface::add_grob (spanner_, ly_symbol2scm ("columns"), beacon_);
     }
 }
 
-void
-Cluster_engraver::start_translation_timestep ()
-{
-  reset_min_max (&pitch_min, &pitch_max);
-}
 
 void
-Cluster_engraver::stop_translation_timestep ()
+Cluster_spanner_engraver::stop_translation_timestep ()
 {
-  if (cluster)
-    {
-      SCM column_scm = get_property ("currentMusicalColumn");
-      if (column_scm == SCM_EOL)
-	{
-	  programming_error("failed retrieving current column");
-	  return;
-	}
+  typeset_grobs ();
 
-      if (Pitch::compare (pitch_min, pitch_max) <= 0)
-	{
-	  int staff_position = pitch_min.steps ();
-	  SCM c0 = get_property ("centralCPosition");
-	  if (gh_number_p (c0))
-	    staff_position += gh_scm2int (c0);
-	  SCM segment = scm_list_n (column_scm,
-				    gh_int2scm (staff_position),
-				    pitch_min.smobbed_copy (),
-				    pitch_max.smobbed_copy (),
-				    SCM_UNDEFINED);
-	  segment = scm_list_n (segment, SCM_UNDEFINED);
-	  columns_scm = (columns_scm != SCM_EOL) ?
-	    gh_append2 (columns_scm, segment) : segment;
-	}
-      else
-	{
-	  /* This timestep is caused by a different voice of the same
-	     staff and hence should be ignored. */
-	}
-    }
+  cluster_notes_.clear ();
+  
 }
 
 void
-Cluster_engraver::acknowledge_grob (Grob_info info)
+Cluster_spanner_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *>(info.grob_);
-  if (item)
+  if (!beacon_ && Note_column::has_interface (info.grob_))
     {
-      if (Note_head::has_interface (info.grob_))
-	{
-	  Music *nr = info.music_cause ();
-	  if (nr && nr->is_mus_type ("note-event"))
-	    {
-	      Pitch pitch = *unsmob_pitch (nr->get_mus_property ("pitch"));
-	      if (Pitch::compare (pitch_min, pitch_max) > 0) // already init'd?
-		{
-		  // not yet init'd; use current pitch to init min/max
-		  pitch_min = pitch;
-		  pitch_max = pitch;
-		}
-	      else if (Pitch::compare (pitch, pitch_max) > 0) // new max?
-		{
-		  pitch_max = pitch;
-		}
-	      else if (Pitch::compare (pitch, pitch_min) < 0) // new min?
-		{
-		  pitch_min = pitch;
-		}
-	    }
-	}
+      finished_spanner_ = spanner_;
+      spanner_ = 0;
     }
 }
 
-ENTER_DESCRIPTION(Cluster_engraver,
-/* descr */	"engraves a cluster",
-/* creats*/	"Cluster",
-/* accepts */	"cluster-event",
-/* acks  */	"note-head-interface",
+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 */	"");
+