X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=7be2bbdc9009553623ebeac2c4e25a98a86343d2;hb=69bfbbd345ec788aef31315b6174cd15a2e3a48e;hp=ae6259ac4c20517f11b7f00965bac3795aacf6c1;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index ae6259ac4c..7be2bbdc90 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,54 +1,68 @@
-/*   
+/*
   dot-column-engraver.cc -- implement Dot_column_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "dot-column-engraver.hh"
+  (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
+{
+  Grob *dotcol_;
+public:
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver);
+
+protected:
+
+  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)
 {
-  Item * i=dynamic_cast <Item *> (info.elem_l_);
-  
-  if (! (i && i->is_type_b (Rhythmic_head::static_name ())))
-      return;
-
-  Rhythmic_head * h = (Rhythmic_head*)i;
-  
-  if (!h->dots_l_)
-    return;
-
-  if (!dotcol_p_)
+  Grob *d = unsmob_grob (info.grob ()->get_object ("dot"));
+  if (d)
     {
-      dotcol_p_ = new Dot_column;
-      announce_element (Score_element_info (dotcol_p_, 0));
-    }
+      if (!dotcol_)
+	dotcol_ = make_item ("DotColumn", SCM_EOL);
 
-  dotcol_p_->add_head (h);
+      Dot_column::add_head (dotcol_, info.grob ());
+    }
 }
 
 
-ADD_THIS_TRANSLATOR(Dot_column_engraver);
-IMPLEMENT_IS_TYPE_B1(Dot_column_engraver,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 */
+		""
+		);