2003 -> 2004

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 89ed54beb1cb03ec839f375c5459934c6ffc6839..8efcf1cd40a1de1f881c914b857a495101cbd435 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,7 +13,7 @@
 #include "stem.hh"
 #include "note-column.hh"
 #include "dot-column.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "item.hh"
 #include "group-interface.hh"
 
@@ -47,10 +47,10 @@
 
 class Rhythmic_column_engraver :public Engraver
 {
-  Link_array<Grob> rhead_l_arr_;
-  Grob * stem_l_;
+  Link_array<Grob> rheads_;
+  Grob * stem_;
   Grob * note_column_;
-  Grob * dotcol_l_;
+  Grob * dotcol_;
 
   Grob * last_spacing_;
   Grob * spacing_;
@@ -59,9 +59,8 @@ class Rhythmic_column_engraver :public Engraver
 protected:
 
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
 };
 
 
@@ -71,58 +70,59 @@ Rhythmic_column_engraver::Rhythmic_column_engraver ()
   spacing_ =0 ;
   last_spacing_ = 0;
   
-  stem_l_ =0;
+  stem_ =0;
   note_column_=0;
-  dotcol_l_ =0;
+  dotcol_ =0;
 }
 
 
 void
-Rhythmic_column_engraver::create_grobs ()
+Rhythmic_column_engraver::process_acknowledged_grobs ()
 {
-  if (rhead_l_arr_.size ())
+  if (rheads_.size ())
     {
       if (!note_column_)
        {
-         note_column_ = new Item (get_property ("NoteColumn"));
-         announce_grob(note_column_, SCM_EOL);
+         note_column_ = make_item ("NoteColumn");
+         announce_grob(note_column_, rheads_[0]->self_scm ());
 
+         spacing_ = make_item ("NoteSpacing");
+         spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL));
 
-         spacing_ = new Item (get_property ("NoteSpacing"));
-         spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL));
-         announce_grob(spacing_, SCM_EOL);
 
-         if (last_spacing_)
-           {
-            Pointer_group_interface::add_grob (last_spacing_,
-                                               ly_symbol2scm ("right-items" ),
-                                               note_column_);
-           }
+         announce_grob (spacing_, SCM_EOL);
+
+         if (last_spacing_)
+           {
+             Pointer_group_interface::add_grob (last_spacing_,
+                                                ly_symbol2scm ("right-items" ),
+                                                note_column_);
+           }
 
        }
 
-      for (int i=0; i < rhead_l_arr_.size (); i++)
+      for (int i=0; i < rheads_.size (); i++)
        {
-         if (!rhead_l_arr_[i]->get_parent (X_AXIS))
-           Note_column::add_head (note_column_, rhead_l_arr_[i]);
+         if (!rheads_[i]->get_parent (X_AXIS))
+           Note_column::add_head (note_column_, rheads_[i]);
        }
-      rhead_l_arr_.set_size (0);
+      rheads_.set_size (0);
     }
 
   
   if (note_column_)
     {
-      if (dotcol_l_
-         && !dotcol_l_->get_parent (X_AXIS))
+      if (dotcol_
+         && !dotcol_->get_parent (X_AXIS))
        {
-         Note_column::set_dotcol (note_column_, dotcol_l_);
+         Note_column::set_dotcol (note_column_, dotcol_);
        }
 
-      if (stem_l_
-         && !stem_l_->get_parent (X_AXIS))
+      if (stem_
+         && !stem_->get_parent (X_AXIS))
        {
-         Note_column::set_stem (note_column_, stem_l_);
-         stem_l_ = 0;
+         Note_column::set_stem (note_column_, stem_);
+         stem_ = 0;
        }
 
     }
@@ -131,18 +131,20 @@ Rhythmic_column_engraver::create_grobs ()
 void
 Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * item =  dynamic_cast <Item *> (i.grob_l_);
-  if (item && Stem::has_interface (item))
+  Item * item =  dynamic_cast <Item *> (i.grob_);
+  if (!item || item->get_parent (X_AXIS))
+    return ; 
+  if (Stem::has_interface (item))
     {
-      stem_l_ = item;
+      stem_ = item;
     }
-  else if (item && Rhythmic_head::has_interface (item))
+  else if (Rhythmic_head::has_interface (item))
     {
-      rhead_l_arr_.push (item);
+      rheads_.push (item);
     }
-  else if (item && Dot_column::has_interface (item))
+  else if (Dot_column::has_interface (item))
     {
-      dotcol_l_ = item;
+      dotcol_ = item;
     }
 }
 
@@ -161,13 +163,9 @@ Rhythmic_column_engraver::stop_translation_timestep ()
       last_spacing_ = spacing_;
       spacing_ =0;
     }
-}
-
-void
-Rhythmic_column_engraver::start_translation_timestep ()
-{
-  dotcol_l_ =0;
-  stem_l_ =0;
+  
+  dotcol_ =0;
+  stem_ =0;
 }
 
 
@@ -175,6 +173,7 @@ Rhythmic_column_engraver::start_translation_timestep ()
 ENTER_DESCRIPTION(Rhythmic_column_engraver,
 /* descr */       "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
 /* creats*/       "NoteColumn NoteSpacing",
-/* acks  */       "stem-interface rhythmic-head-interface dot-column-interface",
+/* accepts */     "",
+/* acks  */      "stem-interface rhythmic-head-interface dot-column-interface",
 /* reads */       "",
 /* write */       "");