patch::: 1.3.115.jcn2

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 04ae0bfba46d236bd4210ce3a6eaa1321549916a..ca52e1273a76792015984a616ea7ca890d725330 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,13 +3,29 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "dot-column-engraver.hh"
+
 #include "rhythmic-head.hh"
 #include "dot-column.hh"
+#include "side-position-interface.hh"
+#include "engraver.hh"
+
+class Dot_column_engraver : public Engraver
+{
+  Grob *dotcol_p_ ;
+  Link_array<Item> head_l_arr_;
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  Dot_column_engraver();
+  
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();  
+};
+
 
 Dot_column_engraver::Dot_column_engraver ()
 {
@@ -17,38 +33,36 @@ Dot_column_engraver::Dot_column_engraver ()
 }
 
 void
-Dot_column_engraver::do_pre_move_processing ()
+Dot_column_engraver::stop_translation_timestep ()
 {
   if (dotcol_p_)
     {
-      typeset_element (dotcol_p_);
+      typeset_grob (dotcol_p_);
       dotcol_p_ =0;
     }
   head_l_arr_.clear ();
 }
 
 void
-Dot_column_engraver::acknowledge_element (Score_element_info info)
+Dot_column_engraver::acknowledge_grob (Grob_info info)
 {
-  Item * i=info.elem_l_->access_Item ();
-  
-  if (! (i && i->is_type_b (Rhythmic_head::static_name ())))
-      return;
+  Grob *d = unsmob_grob (info.elem_l_->get_grob_property ("dot"));
+  if (d)
+    {
+      if (!dotcol_p_)
+       {
+         dotcol_p_ = new Item(get_property ("DotColumn"));
 
-  Rhythmic_head * h = (Rhythmic_head*)i;
-  
-  if (!h->dots_l_)
-    return;
+         Dot_column::set_interface (dotcol_p_);
+         Side_position::set_axis (dotcol_p_, X_AXIS);
+         Side_position::set_direction (dotcol_p_, RIGHT);      
+         announce_grob (dotcol_p_, 0);
+       }
 
-  if (!dotcol_p_)
-    {
-      dotcol_p_ = new Dot_column;
-      announce_element (Score_element_info (dotcol_p_, 0));
+      Dot_column::add_head (dotcol_p_, info.elem_l_);
     }
-
-  dotcol_p_->add_head (h);
 }
 
 
 ADD_THIS_TRANSLATOR(Dot_column_engraver);
-IMPLEMENT_IS_TYPE_B1(Dot_column_engraver,Engraver);
+