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 6c31e63337d062d2e1d182226f5e0ac6ac63e71e..84bd2ae16c8549947405b4669172d9244665d326 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,122 +3,137 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "dimension-cache.hh"
+
 #include "slur.hh"
-#include "rhythmic-column-engraver.hh"
-#include "note-head.hh"
+#include "engraver.hh"
+#include "rhythmic-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
 #include "dot-column.hh"
 #include "musical-request.hh"
+#include "item.hh"
+
+class Rhythmic_column_engraver :public Engraver
+{
+  Link_array<Grob> rhead_l_arr_;
+  Grob * stem_l_;
+  Grob * note_column_;
+  Grob * dotcol_l_;
+
+  Grob * last_spacing_;
+  Grob * spacing_;
+  
+  TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver);
+protected:
+
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+};
+
+
 
-Rhythmic_column_engraver::Rhythmic_column_engraver()
+Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
+  spacing_ =0 ;
+  last_spacing_ = 0;
+  
   stem_l_ =0;
-  ncol_p_=0;
+  note_column_=0;
   dotcol_l_ =0;
 }
 
 
 void
-Rhythmic_column_engraver::process_acknowledged ()
+Rhythmic_column_engraver::create_grobs ()
 {
   if (rhead_l_arr_.size ())
     {
-      if (!ncol_p_)
+      if (!note_column_)
        {
-         ncol_p_ = new Note_column;
-         announce_element (Score_element_info (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))
-           ncol_p_->add_head (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))
        {
-         ncol_p_->set_dotcol (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))
        {
-         ncol_p_->set_stem (stem_l_);
+         Note_column::set_stem (note_column_, stem_l_);
          stem_l_ = 0;
        }
 
-      SCM wg = get_property ("weAreGraceContext",0);
-      bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
-
-      if (!wegrace)
-       for (int i=0; i < grace_slur_endings_.size(); i++)
-         grace_slur_endings_[i]->add_column (ncol_p_);
-      grace_slur_endings_.clear ();
     }
 }
 
 void
-Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
+Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
 {
-  SCM wg = get_property ("weAreGraceContext",0);
-  bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
-  if ((wegrace !=
-      (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED))
-    && !dynamic_cast<Slur*> (i.elem_l_))
-    return ;
-  
-  Item * item =  dynamic_cast <Item *> (i.elem_l_);
-  if (Stem*s=dynamic_cast<Stem *> (item))
+  Item * item =  dynamic_cast <Item *> (i.grob_l_);
+  if (item && Stem::has_interface (item))
     {
-      stem_l_ = s;
+      stem_l_ = item;
     }
-  else if (Rhythmic_head*r=dynamic_cast<Rhythmic_head *> (item))
+  else if (item && Rhythmic_head::has_interface (item))
     {
-      rhead_l_arr_.push (r);
+      rhead_l_arr_.push (item);
     }
-  else if (Dot_column*d =dynamic_cast<Dot_column *> (item))
+  else if (item && Dot_column::has_interface (item))
     {
-      dotcol_l_ = d;
+      dotcol_l_ = item;
     }
-  else if (Slur *s = dynamic_cast<Slur*> (i.elem_l_))
-    {
-      /*
-       end slurs starting on grace notes
-       */
-      
-      if (s->get_elt_property ("grace") != SCM_UNDEFINED)
-       grace_slur_endings_.push (s);
-   }
 }
 
 void
-Rhythmic_column_engraver::do_pre_move_processing()
+Rhythmic_column_engraver::stop_translation_timestep ()
 {
-  if (ncol_p_) 
+  if (note_column_) 
     {
-      typeset_element (ncol_p_);
-      ncol_p_ =0;
+      typeset_grob (note_column_);
+      note_column_ =0;
+    }
+
+  if (spacing_)
+    {
+      typeset_grob (spacing_);
+      last_spacing_ = spacing_;
+      spacing_ =0;
     }
 }
 
 void
-Rhythmic_column_engraver::do_post_move_processing()
+Rhythmic_column_engraver::start_translation_timestep ()
 {
-  grace_slur_endings_.clear ();
   dotcol_l_ =0;
   stem_l_ =0;
 }
 
-ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
 
+
+ENTER_DESCRIPTION(Rhythmic_column_engraver,
+/* descr */       "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+/* creats*/       "NoteColumn",
+/* acks  */       "stem-interface rhythmic-head-interface dot-column-interface",
+/* reads */       "",
+/* write */       "");