X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=04a75241c6cd17eea49ffb67fdf5246e82c718f9;hb=30e335ef53c04c48a840e1c2be1ad546331767ff;hp=2b426cec2c8020a4015f310363830e965b61f08c;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 2b426cec2c..04a75241c6 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,88 +1,61 @@
-/*   
+/*
   dot-column-engraver.cc -- implement Dot_column_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (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 "stem.hh"
+#include "translator.icc"
 
 class Dot_column_engraver : public Engraver
 {
-  Grob *dotcol_ ;
-  Grob * stem_;
-  Link_array<Item> heads_;
+  Grob *dotcol_;
+  vector<Item*> heads_;
 public:
-  TRANSLATOR_DECLARATIONS (Dot_column_engraver );
-  
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver);
+
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();  
-};
 
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void stop_translation_timestep ();
+};
 
 Dot_column_engraver::Dot_column_engraver ()
 {
-  dotcol_ =0;
-  stem_ = 0;
+  dotcol_ = 0;
 }
 
 void
 Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_)
-    {
-
-      /*
-	Add the stem to the support so dots stay clear of flags.
-
-	See [Ross, p 171]
-       */
-      if (stem_)
-	dotcol_->set_property ("stem", stem_->self_scm ());
-      
-      typeset_grob (dotcol_);
-      dotcol_ =0;
-    }
+  dotcol_ = 0;
   heads_.clear ();
-  stem_ =0;
 }
 
 void
-Dot_column_engraver::acknowledge_grob (Grob_info info)
+Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
+  Grob *d = unsmob_grob (info.grob ()->get_object ("dot"));
   if (d)
     {
       if (!dotcol_)
-	{
-	  dotcol_ = make_item ("DotColumn", SCM_EOL);
-	  
-	}
+	dotcol_ = make_item ("DotColumn", SCM_EOL);
 
-      Dot_column::add_head (dotcol_, info.grob_);
-    }
-  else if (Stem::has_interface (info.grob_))
-    {
-      stem_ = info.grob_;
+      Dot_column::add_head (dotcol_, info.grob ());
     }
 }
 
 
-
-
-ENTER_DESCRIPTION (Dot_column_engraver,
-/* descr */       " Engraves dots on dotted notes shifted to the right of the note.\n"
-"If omitted, then dots appear on top of the notes.",
-/* creats*/       "DotColumn",
-/* accepts */     "",
-/* acks  */      "rhythmic-head-interface dot-column-interface stem-interface",
-/* reads */       "",
-/* write */       "");
+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",
+		/* read */ "",
+		/* write */ "");