release: 1.5.27

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index ac1515162a31870c97060ce27c11392f6b1a3c33..84bd2ae16c8549947405b4669172d9244665d326 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -20,8 +20,11 @@ class Rhythmic_column_engraver :public Engraver
 {
   Link_array<Grob> rhead_l_arr_;
   Grob * stem_l_;
-  Grob *ncol_p_;
-  Grob *dotcol_l_;
+  Grob * note_column_;
+  Grob * dotcol_l_;
+
+  Grob * last_spacing_;
+  Grob * spacing_;
   
   TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver);
 protected:
@@ -30,15 +33,17 @@ protected:
   virtual void create_grobs ();
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  
 };
 
 
 
 Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
+  spacing_ =0 ;
+  last_spacing_ = 0;
+  
   stem_l_ =0;
-  ncol_p_=0;
+  note_column_=0;
   dotcol_l_ =0;
 }
 
@@ -48,34 +53,34 @@ Rhythmic_column_engraver::create_grobs ()
 {
   if (rhead_l_arr_.size ())
     {
-      if (!ncol_p_)
+      if (!note_column_)
        {
-         ncol_p_ = new Item (get_property ("NoteColumn"));
-         Note_column::set_interface (ncol_p_);
-         announce_grob (ncol_p_, 0);
+         note_column_ = new Item (get_property ("NoteColumn"));
+         Note_column::set_interface (note_column_);
+         announce_grob (note_column_, 0);
        }
 
       for (int i=0; i < rhead_l_arr_.size (); i++)
        {
-         if (!rhead_l_arr_[i]->parent_l (X_AXIS))
-           Note_column::add_head (ncol_p_, rhead_l_arr_[i]);
+         if (!rhead_l_arr_[i]->get_parent (X_AXIS))
+           Note_column::add_head (note_column_, rhead_l_arr_[i]);
        }
       rhead_l_arr_.set_size (0);
     }
 
   
-  if (ncol_p_)
+  if (note_column_)
     {
       if (dotcol_l_
-         && !dotcol_l_->parent_l (X_AXIS))
+         && !dotcol_l_->get_parent (X_AXIS))
        {
-         Note_column::set_dotcol (ncol_p_, dotcol_l_);
+         Note_column::set_dotcol (note_column_, dotcol_l_);
        }
 
       if (stem_l_
-         && !stem_l_->parent_l (X_AXIS))
+         && !stem_l_->get_parent (X_AXIS))
        {
-         Note_column::set_stem (ncol_p_, stem_l_);
+         Note_column::set_stem (note_column_, stem_l_);
          stem_l_ = 0;
        }
 
@@ -103,10 +108,17 @@ Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
 void
 Rhythmic_column_engraver::stop_translation_timestep ()
 {
-  if (ncol_p_) 
+  if (note_column_) 
+    {
+      typeset_grob (note_column_);
+      note_column_ =0;
+    }
+
+  if (spacing_)
     {
-      typeset_grob (ncol_p_);
-      ncol_p_ =0;
+      typeset_grob (spacing_);
+      last_spacing_ = spacing_;
+      spacing_ =0;
     }
 }
 
@@ -122,6 +134,6 @@ Rhythmic_column_engraver::start_translation_timestep ()
 ENTER_DESCRIPTION(Rhythmic_column_engraver,
 /* descr */       "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
 /* creats*/       "NoteColumn",
-/* acks  */       "stem-interface rhythmicb-head-interface dot-column-interface",
+/* acks  */       "stem-interface rhythmic-head-interface dot-column-interface",
 /* reads */       "",
 /* write */       "");