release: 1.5.29

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 8c6faa3d704334bf08f8752777034d43b0730c58..55462e76a970b4cba3b742d8523524b727d18a69 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,13 +15,45 @@
 #include "dot-column.hh"
 #include "musical-request.hh"
 #include "item.hh"
+#include "group-interface.hh"
+
+
+
+/*
+  this engraver  glues together stems, rests and note heads into a NoteColumn
+  grob.
+
+  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
+  8ths triplets combined made the program believe there were 1/12 th
+  notes.).
+
+  Doing it in a separate engraver using timing info is generally
+  complicated (start/end time management), and fucks up if a voice
+  changes staff.
+
+  Now we do it from here again. This has the problem that voices can
+  appear and disappear at will, leaving lots of loose ends (the note
+  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
 {
   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 +62,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 +82,47 @@ 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);
+
+
+         spacing_ = new Item (get_property ("NoteSpacing"));
+         spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL));
+         announce_grob (spacing_, 0);
+
+         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++)
        {
-         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 +150,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;
     }
 }
 
@@ -121,7 +175,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",
-/* acks  */       "stem-interface note-head-interface dot-column-interface",
+/* creats*/       "NoteColumn NoteSpacing",
+/* acks  */       "stem-interface rhythmic-head-interface dot-column-interface",
 /* reads */       "",
 /* write */       "");