remove $(release-dir)/ ; must contain actions within build or srcdir

[lilypond.git] / lily / rhythmic-column-engraver.cc

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index fe140090efdf9cec82490b71512eef5bba045980..9543fcc92f1e45d83fcff5010f29f6025c4180f2 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -41,7 +41,7 @@
 
 class Rhythmic_column_engraver : public Engraver
 {
-  Link_array<Grob> rheads_;
+  vector<Grob*> rheads_;
   Grob *stem_;
   Grob *note_column_;
   Grob *dotcol_;
@@ -49,8 +49,8 @@ class Rhythmic_column_engraver : public Engraver
   Grob *last_spacing_;
   Grob *spacing_;
 
-  void add_spacing_item (Grob*);
-  
+  void add_spacing_item (Grob *);
+
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
@@ -101,21 +101,19 @@ Rhythmic_column_engraver::process_acknowledged ()
          add_spacing_item (note_column_);
        }
 
-      for (int i = 0; i < rheads_.size (); i++)
+      for (vsize i = 0; i < rheads_.size (); i++)
        {
          if (!rheads_[i]->get_parent (X_AXIS))
            Note_column::add_head (note_column_, rheads_[i]);
        }
-      rheads_.set_size (0);
+      rheads_.resize (0);
     }
 
   if (note_column_)
     {
       if (dotcol_
          && !dotcol_->get_parent (X_AXIS))
-       {
-         Note_column::set_dotcol (note_column_, dotcol_);
-       }
+       Note_column::set_dotcol (note_column_, dotcol_);
 
       if (stem_
          && !stem_->get_parent (X_AXIS))
@@ -129,13 +127,13 @@ Rhythmic_column_engraver::process_acknowledged ()
 void
 Rhythmic_column_engraver::acknowledge_stem (Grob_info i)
 {
-  stem_ = i.grob();
+  stem_ = i.grob ();
 }
 
 void
 Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
 {
-  rheads_.push (i.grob ());
+  rheads_.push_back (i.grob ());
 }
 
 void
@@ -159,14 +157,12 @@ Rhythmic_column_engraver::stop_translation_timestep ()
   stem_ = 0;
 }
 
-
 ADD_ACKNOWLEDGER (Rhythmic_column_engraver, dot_column);
 ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
 ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
-               /* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
-               /* creats*/ "NoteColumn NoteSpacing",
-               /* accepts */ "",
-               /* reads */ "",
+               /* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+               /* create */ "NoteColumn NoteSpacing",
+               /* read */ "",
                /* write */ "");