* The grand 2005-2006 replace.

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 2bd44f58afe410059f32e336b29fdb1e319f5b0d..a157b6a71560aed957632fd39ddf12710bf94860 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rhythmic-head.hh"
@@ -11,6 +11,7 @@
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "stem.hh"
+#include "translator.icc"
 
 class Dot_column_engraver : public Engraver
 {
@@ -21,8 +22,11 @@ public:
   TRANSLATOR_DECLARATIONS (Dot_column_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void stop_translation_timestep ();
 };
 
 Dot_column_engraver::Dot_column_engraver ()
@@ -40,7 +44,7 @@ Dot_column_engraver::stop_translation_timestep ()
     See [Ross, p 171]
   */
   if (stem_ && dotcol_)
-    dotcol_->set_property ("stem", stem_->self_scm ());
+    dotcol_->set_object ("stem", stem_->self_scm ());
 
   dotcol_ = 0;
   heads_.clear ();
@@ -48,29 +52,30 @@ Dot_column_engraver::stop_translation_timestep ()
 }
 
 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 ());
     }
 }
 
+void
+Dot_column_engraver::acknowledge_stem (Grob_info info)
+{
+  stem_ = info.grob ();
+}
+
+ADD_ACKNOWLEDGER (Dot_column_engraver, stem);
+ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
 ADD_TRANSLATOR (Dot_column_engraver,
-               /* descr */ "Engraves dots on dotted notes shifted to the right of the note.\n"
+               /* doc */ "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 */ "",
+               /* create */ "DotColumn",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");