* buildscripts/lilypond.words.py: remove.

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 7099ecae8b804247a947184e2c19892145f2087b..5e4b5385b82e4612547a80673570db9824a3bb7a 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"
 
@@ -55,13 +55,12 @@ class Rhythmic_column_engraver :public Engraver
   Grob * last_spacing_;
   Grob * spacing_;
   
-  TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver);
+  TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
   virtual void acknowledge_grob (Grob_info);
   virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
 };
 
 
@@ -84,20 +83,21 @@ Rhythmic_column_engraver::process_acknowledged_grobs ()
     {
       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_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_);
+           }
 
        }
 
@@ -163,20 +163,17 @@ Rhythmic_column_engraver::stop_translation_timestep ()
       last_spacing_ = spacing_;
       spacing_ =0;
     }
-}
-
-void
-Rhythmic_column_engraver::start_translation_timestep ()
-{
+  
   dotcol_ =0;
   stem_ =0;
 }
 
 
 
-ENTER_DESCRIPTION(Rhythmic_column_engraver,
+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 */       "");