Run `make grand-replace'.

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

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 37f7f446b78aad58c45fd19788528d8ecd061dd2..ecf071b91836c1bc770030d637fad23633ad6962 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,122 +1,148 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2003 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
 
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "spanner.hh"
 #include "note-head.hh"
-#include "protected-scm.hh"
-#include "warn.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_engraver : public Engraver
+class Cluster_spanner_engraver : public Engraver
 {
 
 protected:
-TRANSLATOR_DECLARATIONS(Cluster_engraver);
-  virtual bool try_music (Music *);
-  virtual void process_music ();  
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-
+  TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver);
+  DECLARE_TRANSLATOR_LISTENER (cluster_note);
+  DECLARE_ACKNOWLEDGER (note_column);
+  void stop_translation_timestep ();
+  virtual void process_music ();
+  virtual void finalize ();
 private:
-  Drul_array<Music*> reqs_drul_;
+  vector<Stream_event*> cluster_notes_;
+  Item *beacon_;
 
-  Spanner *cluster_;
+  void typeset_grobs ();
+  Spanner *spanner_;
+  Spanner *finished_spanner_;
 };
 
-Cluster_engraver::Cluster_engraver ()
+Cluster_spanner_engraver::Cluster_spanner_engraver ()
 {
-  cluster_ = 0;
-  reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0;
+  spanner_ = 0;
+  finished_spanner_ = 0;
+  beacon_ = 0;
 }
 
-bool
-Cluster_engraver::try_music (Music *m)
+void
+Cluster_spanner_engraver::finalize ()
+{
+  typeset_grobs ();
+  finished_spanner_ = spanner_;
+  spanner_ = 0;
+  typeset_grobs ();
+}
+
+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_)
+      if (!finished_spanner_->get_bound (RIGHT))
        {
-         cluster_->suicide ();
-         cluster_ = 0;
+         finished_spanner_->set_bound (RIGHT,
+                                       finished_spanner_->get_bound (LEFT));
+                                       
        }
+      
+      finished_spanner_ = 0;
     }
-  else if (m->is_mus_type ("cluster-event"))
-    {
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
+  beacon_ = 0;
+}
 
-      reqs_drul_[d] = m;
-      return true;
-    }
-  return false;
+IMPLEMENT_TRANSLATOR_LISTENER (Cluster_spanner_engraver, cluster_note);
+void
+Cluster_spanner_engraver::listen_cluster_note (Stream_event *ev)
+{
+  cluster_notes_.push_back (ev);
 }
 
 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 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
+      int pmax = INT_MIN;
+      int pmin = INT_MAX;
+
+      for (vsize i = 0; i < cluster_notes_.size (); i++)
        {
-         Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
-         cluster_->set_bound (RIGHT, bound);
+         Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
+
+         int p = (pit ? pit->steps () : 0) + c0;
+
+         pmax = max (pmax, p);
+         pmin = min (pmin, p);
        }
+
+      beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());
+      beacon_->set_property ("positions",
+                            scm_cons (scm_from_int (pmin),
+                                      scm_from_int (pmax)));
     }
-  if (reqs_drul_[START])
+
+  if (beacon_ && !spanner_)
+    spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm ());
+
+  if (beacon_ && spanner_)
     {
-      if (cluster_)
-       {
-         reqs_drul_[START]->origin ()->warning ("may not nest clusters");
-       }
-      else
-       {
-         cluster_ = new Spanner (get_property ("Cluster"));
-         Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
-         cluster_->set_bound (LEFT, bound);
-         announce_grob (cluster_, reqs_drul_[START]->self_scm ());
-       }
-      reqs_drul_[START] = 0;
+      add_bound_item (spanner_, beacon_);
+      Pointer_group_interface::add_grob (spanner_, ly_symbol2scm ("columns"), beacon_);
     }
 }
 
-
 void
-Cluster_engraver::stop_translation_timestep ()
+Cluster_spanner_engraver::stop_translation_timestep ()
 {
-  if (reqs_drul_[STOP])
-    {
-      reqs_drul_[STOP] = 0;
-      typeset_grob (cluster_);
-      cluster_ = 0;
-    }
+  typeset_grobs ();
+  cluster_notes_.clear ();
 }
 
 void
-Cluster_engraver::acknowledge_grob (Grob_info info)
+Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (cluster_ && Note_column::has_interface (info.grob_))
+  if (!beacon_ && Note_column::has_interface (info.grob ()))
     {
-      Pointer_group_interface::add_grob (cluster_, ly_symbol2scm ("columns"), info.grob_);
+      finished_spanner_ = spanner_;
+      spanner_ = 0;
     }
 }
 
-ENTER_DESCRIPTION(Cluster_engraver,
-/* descr */    "engraves a cluster",
-/* creats*/    "Cluster",
-/* accepts */  "cluster-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 */
+               ""
+               );
+