Run `make grand-replace'.

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 53f1bdc62e68a135ebd1f7ce1abcc4e67902fb77..1d6f937e92b9e4a15c444817a166df3111e00d7c 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,82 +1,68 @@
-/*   
+/*
   dot-column-engraver.cc -- implement Dot_column_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2008 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"
+#include "item.hh"
 
 class Dot_column_engraver : public Engraver
 {
-  Grob *dotcol_ ;
-  Grob * stem_;
-  Link_array<Item> heads_;
+  Grob *dotcol_;
 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;
 }
 
 void
 Dot_column_engraver::stop_translation_timestep ()
 {
-  /*
-    Add the stem to the support so dots stay clear of flags.
-
-    See [Ross, p 171]
-  */
-  if (stem_ && dotcol_)
-    dotcol_->set_property ("stem", stem_->self_scm ());
-      
   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 ());
     }
 }
 
 
+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 ",
 
-ADD_TRANSLATOR (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 */       "");
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );