X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=a2b1cdf3a5bfd26765499739d86681a89fadb152;hb=bdd3c80b32f39751ed30a89a4623ede6fe0c6df3;hp=5c2cfd49c4186f297fa87bde365cdf6c67fb347e;hpb=736088f09a0b77acc84f6e1a54cddb8bad3d94c1;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 5c2cfd49c4..a2b1cdf3a5 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,54 +1,62 @@
-/*   
+/*
   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>
-  
- */
 
-#include "dot-column-engraver.hh"
+  (c) 1998--2006 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"
+
+class Dot_column_engraver : public Engraver
+{
+  Grob *dotcol_;
+  vector<Item*> heads_;
+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;
+  heads_.clear ();
 }
 
 void
-Dot_column_engraver::acknowledge_element (Score_element_info info)
+Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Rhythmic_head * h = dynamic_cast<Rhythmic_head*>(info.elem_l_);
-  if (!h)
-      return;
-
-  if (!h->dots_l ())
-    return;
-
-  if (!dotcol_p_)
+  Grob *d = unsmob_grob (info.grob ()->get_object ("dot"));
+  if (d)
     {
-      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));
-    }
+      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);
-
+ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
+ADD_TRANSLATOR (Dot_column_engraver,
+		/* doc */ "Engraves dots on dotted notes shifted to the right of the note.\n"
+		"If omitted, then dots appear on top of the notes.",
+		/* create */ "DotColumn",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");