X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=7be2bbdc9009553623ebeac2c4e25a98a86343d2;hb=16b127866a6dc83392db2c2ad00a5fffd467b7e6;hp=935d3f3e65e28375bb2ce9870c03b36cbe4e77c4;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 935d3f3e65..7be2bbdc90 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,68 +1,68 @@
-/*   
+/*
   dot-column-engraver.cc -- implement Dot_column_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "rhythmic-head.hh"
 #include "dot-column.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
+#include "translator.icc"
+#include "item.hh"
 
 class Dot_column_engraver : public Engraver
 {
-  Score_element *dotcol_p_ ;
-  Link_array<Item> head_l_arr_;
+  Grob *dotcol_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Dot_column_engraver();
-  
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver);
+
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing ();  
-};
 
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void stop_translation_timestep ();
+};
 
 Dot_column_engraver::Dot_column_engraver ()
 {
-  dotcol_p_ =0;
+  dotcol_ = 0;
 }
 
 void
-Dot_column_engraver::do_pre_move_processing ()
+Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_p_)
-    {
-      typeset_element (dotcol_p_);
-      dotcol_p_ =0;
-    }
-  head_l_arr_.clear ();
+  dotcol_ = 0;
 }
 
 void
-Dot_column_engraver::acknowledge_element (Score_element_info info)
+Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Score_element *d = unsmob_element (info.elem_l_->get_elt_property ("dot"));
+  Grob *d = unsmob_grob (info.grob ()->get_object ("dot"));
   if (d)
     {
-      if (!dotcol_p_)
-	{
-	  dotcol_p_ = new Item(get_property ("basicDotColumnProperties"));
-
-	  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_)
+	dotcol_ = make_item ("DotColumn", SCM_EOL);
 
-      Dot_column::add_head (dotcol_p_, info.elem_l_);
+      Dot_column::add_head (dotcol_, info.grob ());
     }
 }
 
 
-ADD_THIS_TRANSLATOR(Dot_column_engraver);
+ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
+ADD_TRANSLATOR (Dot_column_engraver,
+		/* doc */
+		"Engrave dots on dotted notes shifted to the right of the"
+		" note.  If omitted, then dots appear on top of the notes.",
+
+		/* create */
+		"DotColumn ",
+
+		/* read */
+		"",
 
+		/* write */
+		""
+		);