* The grand 2005-2006 replace.

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index af4f263aa15e29b0283d11c17581bd31d1daa4d8..d40de198def195a9a92113146d8e30f3557444e1 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"
@@ -11,7 +11,9 @@
 #include "stem.hh"
 #include "note-column.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
@@ -47,12 +49,16 @@ class Rhythmic_column_engraver : public Engraver
   Grob *last_spacing_;
   Grob *spacing_;
 
+  void add_spacing_item (Grob *);
+
   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 ()
@@ -66,7 +72,24 @@ Rhythmic_column_engraver::Rhythmic_column_engraver ()
 }
 
 void
-Rhythmic_column_engraver::process_acknowledged_grobs ()
+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 ()
 {
   if (rheads_.size ())
     {
@@ -75,14 +98,7 @@ Rhythmic_column_engraver::process_acknowledged_grobs ()
          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_);
-           }
+         add_spacing_item (note_column_);
        }
 
       for (int i = 0; i < rheads_.size (); i++)
@@ -97,9 +113,7 @@ Rhythmic_column_engraver::process_acknowledged_grobs ()
     {
       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,23 +125,21 @@ 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::acknowledge_rhythmic_head (Grob_info i)
+{
+  rheads_.push (i.grob ());
+}
+
+void
+Rhythmic_column_engraver::acknowledge_dot_column (Grob_info i)
+{
+  dotcol_ = i.grob ();
 }
 
 void
@@ -145,10 +157,13 @@ 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 */ "",
-               /* acks  */ "stem-interface rhythmic-head-interface dot-column-interface",
-               /* reads */ "",
+               /* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+               /* create */ "NoteColumn NoteSpacing",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");