doc patch by Graham Percival

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 80e483dfc620d43b19c3091189661d463ae8a843..960a6e942a571f0295f8a31ed13426edd1e891b3 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -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,7 +59,7 @@ 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,16 +71,16 @@ 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_)
        {
@@ -90,6 +90,11 @@ Rhythmic_column_engraver::create_grobs ()
 
          spacing_ = new Item (get_property ("NoteSpacing"));
          spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL));
+
+        /*
+          Should insert a cause. Collision warnings go into the  void.
+          
+         */
          announce_grob(spacing_, SCM_EOL);
 
          if (last_spacing_)
@@ -101,28 +106,28 @@ Rhythmic_column_engraver::create_grobs ()
 
        }
 
-      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,20 +136,20 @@ Rhythmic_column_engraver::create_grobs ()
 void
 Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * item =  dynamic_cast <Item *> (i.grob_l_);
+  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 (Rhythmic_head::has_interface (item))
     {
-      rhead_l_arr_.push (item);
+      rheads_.push (item);
     }
   else if (Dot_column::has_interface (item))
     {
-      dotcol_l_ = item;
+      dotcol_ = item;
     }
 }
 
@@ -168,8 +173,8 @@ Rhythmic_column_engraver::stop_translation_timestep ()
 void
 Rhythmic_column_engraver::start_translation_timestep ()
 {
-  dotcol_l_ =0;
-  stem_l_ =0;
+  dotcol_ =0;
+  stem_ =0;
 }
 
 
@@ -177,6 +182,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 */       "");