* lily/SConscript: Remove ttftools.

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 48b4500600b7d8b48507f61dd86614fc844d2fa6..d29df4fdc764dff3ff7a04b54df5fbaf091e32b8 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -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);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void stop_translation_timestep ();
 };
 
 Dot_column_engraver::Dot_column_engraver ()
@@ -48,31 +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_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 ();
-    }
 }
 
-#include "translator.icc"
+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 */ "");