* 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 f095ef8e1e069d176fa32f54db56b3385a7b37c1..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
@@ -19,7 +21,7 @@
 
   It also generates spacing objects.  Originally, we have tried to
   have the spacing functionality at different levels.
-  
+
   - by simply using the sequence of Separation-item as
   spacing-sequences (at staff level). Unfortunately, this fucks up if
   there are different kinds of tuplets in different voices (8th and
@@ -35,43 +37,59 @@
   spacing engraver don't know where to connect the last note of the
   voice on the right with), but we don't complain about those, and let
   the default spacing do its work.
+*/
 
- */
-
-
-class Rhythmic_column_engraver :public Engraver
+class Rhythmic_column_engraver : public Engraver
 {
   Link_array<Grob> rheads_;
-  Grob * stem_;
-  Grob * note_column_;
-  Grob * dotcol_;
+  Grob *stem_;
+  Grob *note_column_;
+  Grob *dotcol_;
+
+  Grob *last_spacing_;
+  Grob *spacing_;
+
+  void add_spacing_item (Grob *);
 
-  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 ;
+  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_grobs ()
+Rhythmic_column_engraver::process_acknowledged ()
 {
   if (rheads_.size ())
     {
@@ -80,18 +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++)
@@ -102,14 +109,11 @@ Rhythmic_column_engraver::process_acknowledged_grobs ()
       rheads_.set_size (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))
@@ -117,51 +121,49 @@ Rhythmic_column_engraver::process_acknowledged_grobs ()
          Note_column::set_stem (note_column_, stem_);
          stem_ = 0;
        }
-
     }
 }
 
 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
 Rhythmic_column_engraver::stop_translation_timestep ()
 {
-      note_column_ = 0;
+  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 */     "",
-/* acks  */      "stem-interface rhythmic-head-interface dot-column-interface",
-/* reads */       "",
-/* write */       "");
+               /* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+               /* create */ "NoteColumn NoteSpacing",
+               /* accept */ "",
+               /* read */ "",
+               /* write */ "");