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 f726dc88ab5c4533b026824412419386eb707740..fc21e618eb202059a234c64e33e29101aed22721 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,15 +3,18 @@
 
   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 "group-interface.hh"
+#include "pointer-group-interface.hh"
+
+#include "translator.icc"
 
 /*
   this engraver  glues together stems, rests and note heads into a NoteColumn
@@ -39,67 +42,53 @@
 
 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_;
-
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (dot_column);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 };
 
 Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
-  spacing_ = 0;
-  last_spacing_ = 0;
 
   stem_ = 0;
   note_column_ = 0;
   dotcol_ = 0;
 }
 
+
 void
-Rhythmic_column_engraver::process_acknowledged_grobs ()
+Rhythmic_column_engraver::process_acknowledged ()
 {
   if (rheads_.size ())
     {
       if (!note_column_)
        {
          note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
-
-         spacing_ = make_item ("NoteSpacing", SCM_EOL);
-         spacing_->set_property ("left-items", scm_cons (note_column_->self_scm (), SCM_EOL));
-
-         if (last_spacing_)
-           {
-             Pointer_group_interface::add_grob (last_spacing_,
-                                                ly_symbol2scm ("right-items"),
-                                                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))
@@ -111,44 +100,37 @@ Rhythmic_column_engraver::process_acknowledged_grobs ()
 }
 
 void
-Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
+Rhythmic_column_engraver::acknowledge_stem (Grob_info i)
 {
-  Item *item = dynamic_cast<Item *> (i.grob_);
-  if (!item || item->get_parent (X_AXIS))
-    return;
-  if (Stem::has_interface (item))
-    {
-      stem_ = item;
-    }
-  else if (Rhythmic_head::has_interface (item))
-    {
-      rheads_.push (item);
-    }
-  else if (Dot_column::has_interface (item))
-    {
-      dotcol_ = item;
-    }
+  stem_ = i.grob ();
 }
 
 void
-Rhythmic_column_engraver::stop_translation_timestep ()
+Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
 {
-  note_column_ = 0;
+  rheads_.push_back (i.grob ());
+}
 
-  if (spacing_)
-    {
-      last_spacing_ = spacing_;
-      spacing_ = 0;
-    }
+void
+Rhythmic_column_engraver::acknowledge_dot_column (Grob_info i)
+{
+  dotcol_ = i.grob ();
+}
 
+void
+Rhythmic_column_engraver::stop_translation_timestep ()
+{
+  note_column_ = 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 */ "",
-               /* acks  */ "stem-interface rhythmic-head-interface dot-column-interface",
-               /* reads */ "",
+               /* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+               /* create */ "NoteColumn",
+               /* read */ "",
                /* write */ "");