Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 542863a376967cd68121d8eed06e0e1fbf49cf80..faac5f79d0c90c5e66e82cbc0f9c41aa089f9c77 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,16 +1,17 @@
 /*
   cluster-engraver.cc -- implement Cluster_engraver
 
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
 
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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"
 
 class Cluster_spanner_engraver : public Engraver
 {
@@ -18,17 +19,17 @@ 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 ();
+  void process_music ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  void stop_translation_timestep ();
   virtual void finalize ();
 private:
-  Link_array<Music> cluster_notes_;
-  Item* beacon_;
+  vector<Music*> cluster_notes_;
+  Item *beacon_;
 
   void typeset_grobs ();
   Spanner *spanner_;
-  Spanner *finished_spanner_ ;
+  Spanner *finished_spanner_;
 };
 
 Cluster_spanner_engraver::Cluster_spanner_engraver ()
@@ -59,12 +60,12 @@ Cluster_spanner_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("cluster-note-event"))
     {
-      cluster_notes_.push (m);
+      cluster_notes_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
     return cluster_notes_.size ();
-  
+
   return false;
 }
 
@@ -75,31 +76,29 @@ Cluster_spanner_engraver::process_music ()
     {
       SCM c0scm = get_property ("middleCPosition");
 
-      int c0 =  scm_is_number (c0scm) ? scm_to_int (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++)
+
+      for (vsize i = 0; i < cluster_notes_.size (); i++)
        {
-         Pitch *pit =unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
+         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_)
     {
       add_bound_item (spanner_, beacon_);
@@ -107,7 +106,6 @@ Cluster_spanner_engraver::process_music ()
     }
 }
 
-
 void
 Cluster_spanner_engraver::stop_translation_timestep ()
 {
@@ -116,20 +114,22 @@ 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_ && 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 busy-playing-event",
-/* acks  */    "note-column-interface",
-/* reads */    "",
-/* write */    "");
+#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",
+               /* read */      "",
+               /* write */     "");