patch::: 1.3.86.jcn2

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 88108cbea861cdd1c5da8d04a940a018d72f396f..935d3f3e65e28375bb2ce9870c03b36cbe4e77c4 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -7,9 +7,25 @@
   
  */
 
-#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
+{
+  Score_element *dotcol_p_ ;
+  Link_array<Item> head_l_arr_;
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  Dot_column_engraver();
+  
+protected:
+  virtual void acknowledge_element (Score_element_info);
+  virtual void do_pre_move_processing ();  
+};
+
 
 Dot_column_engraver::Dot_column_engraver ()
 {
@@ -30,20 +46,21 @@ Dot_column_engraver::do_pre_move_processing ()
 void
 Dot_column_engraver::acknowledge_element (Score_element_info info)
 {
-  Rhythmic_head * h = dynamic_cast<Rhythmic_head*>(info.elem_l_);
-  if (!h)
-      return;
+  Score_element *d = unsmob_element (info.elem_l_->get_elt_property ("dot"));
+  if (d)
+    {
+      if (!dotcol_p_)
+       {
+         dotcol_p_ = new Item(get_property ("basicDotColumnProperties"));
 
-  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_element (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);
 }