Merge with master

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index fe140090efdf9cec82490b71512eef5bba045980..fc21e618eb202059a234c64e33e29101aed22721 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "rhythmic-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
+#include "item.hh"
 #include "dot-column.hh"
 #include "pointer-group-interface.hh"
 
@@ -41,16 +42,11 @@
 
 class Rhythmic_column_engraver : public Engraver
 {
-  Link_array<Grob> rheads_;
+  vector<Grob*> rheads_;
   Grob *stem_;
   Grob *note_column_;
   Grob *dotcol_;
 
-  Grob *last_spacing_;
-  Grob *spacing_;
-
-  void add_spacing_item (Grob*);
-  
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
@@ -63,31 +59,13 @@ protected:
 
 Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
-  spacing_ = 0;
-  last_spacing_ = 0;
 
   stem_ = 0;
   note_column_ = 0;
   dotcol_ = 0;
 }
 
-void
-Rhythmic_column_engraver::add_spacing_item (Grob *g)
-{
-  if (spacing_)
-    {
-      Pointer_group_interface::add_grob (spacing_,
-                                        ly_symbol2scm ("left-items"),
-                                        g);
 
-      if (last_spacing_)
-       {
-         Pointer_group_interface::add_grob (last_spacing_,
-                                            ly_symbol2scm ("right-items"),
-                                            g);
-       }
-    }
-}
 void
 Rhythmic_column_engraver::process_acknowledged ()
 {
@@ -96,26 +74,21 @@ Rhythmic_column_engraver::process_acknowledged ()
       if (!note_column_)
        {
          note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
-
-         spacing_ = make_item ("NoteSpacing", SCM_EOL);
-         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 +102,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
@@ -148,25 +121,16 @@ void
 Rhythmic_column_engraver::stop_translation_timestep ()
 {
   note_column_ = 0;
-
-  if (spacing_)
-    {
-      last_spacing_ = spacing_;
-      spacing_ = 0;
-    }
-
   dotcol_ = 0;
   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",
+               /* read */ "",
                /* write */ "");