release: 1.5.4

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 5c2cfd49c4186f297fa87bde365cdf6c67fb347e..9dec1242c2d72a58a45375d5721ab87183885e66 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,52 +3,81 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 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"
+#include "stem.hh"
+
+class Dot_column_engraver : public Engraver
+{
+  Grob *dotcol_ ;
+  Grob * stem_;
+  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 ()
 {
-  dotcol_p_ =0;
+  dotcol_ =0;
+  stem_ = 0;
 }
 
 void
-Dot_column_engraver::do_pre_move_processing ()
+Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_p_)
+  if (dotcol_)
     {
-      typeset_element (dotcol_p_);
-      dotcol_p_ =0;
+
+      /*
+       Add the stem to the support so dots stay clear of flags.
+
+       See [Ross, p 171]
+       */
+      if (stem_)
+       dotcol_->set_grob_property ("stem", stem_->self_scm ());
+      
+      typeset_grob (dotcol_);
+      dotcol_ =0;
     }
   head_l_arr_.clear ();
+  stem_ =0;
 }
 
 void
-Dot_column_engraver::acknowledge_element (Score_element_info info)
+Dot_column_engraver::acknowledge_grob (Grob_info info)
 {
-  Rhythmic_head * h = dynamic_cast<Rhythmic_head*>(info.elem_l_);
-  if (!h)
-      return;
+  Grob *d = unsmob_grob (info.elem_l_->get_grob_property ("dot"));
+  if (d)
+    {
+      if (!dotcol_)
+       {
+         dotcol_ = new Item (get_property ("DotColumn"));
 
-  if (!h->dots_l ())
-    return;
+         Dot_column::set_interface (dotcol_);
+         announce_grob (dotcol_, 0);
+       }
 
-  if (!dotcol_p_)
+      Dot_column::add_head (dotcol_, info.elem_l_);
+    }
+  else if (Stem::has_interface (info.elem_l_))
     {
-      dotcol_p_ = new Dot_column;
-      Side_position_interface (dotcol_p_).set_axis (X_AXIS);
-      Side_position_interface (dotcol_p_).set_direction (RIGHT);      
-      announce_element (Score_element_info (dotcol_p_, 0));
+      stem_ = info.elem_l_;
     }
-
-  dotcol_p_->add_head (h);
 }
 
 
-ADD_THIS_TRANSLATOR(Dot_column_engraver);
+ADD_THIS_TRANSLATOR (Dot_column_engraver);