* The grand 2005-2006 replace.

[lilypond.git] / lily / measure-grouping-engraver.cc

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index f44a8b3b5b2a7115f44b479a6f4949610809a2da..fc6e2ed7eee9fb3956268d27b3427811b896e65c 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
@@ -11,6 +11,8 @@
 #include "global-context.hh"
 #include "engraver.hh"
 
+#include "translator.icc"
+
 class Measure_grouping_engraver : public Engraver
 {
 public:
@@ -20,9 +22,9 @@ protected:
   Spanner *grouping_;
   Rational stop_grouping_mom_;
 
-  virtual void process_music ();
+  void process_music ();
   virtual void finalize ();
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (note_column);
 };
 
 void
@@ -37,12 +39,10 @@ Measure_grouping_engraver::finalize ()
 }
 
 void
-Measure_grouping_engraver::acknowledge_grob (Grob_info gi)
+Measure_grouping_engraver::acknowledge_note_column (Grob_info gi)
 {
   if (grouping_)
-    {
-      Side_position_interface::add_support (grouping_, gi.grob ());
-    }
+    Side_position_interface::add_support (grouping_, gi.grob ());
 }
 
 void
@@ -99,15 +99,16 @@ Measure_grouping_engraver::process_music ()
        }
     }
 }
+
 Measure_grouping_engraver::Measure_grouping_engraver ()
 {
   grouping_ = 0;
 }
 
+ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column);
 ADD_TRANSLATOR (Measure_grouping_engraver,
-               /* descr */ "Creates MeasureGrouping to indicate beat subdivision.",
-               /* creats*/ "MeasureGrouping",
-               /* accepts */ "",
-               /* acks  */ "note-column-interface",
-               /* reads */ "beatGrouping beatLength measurePosition currentMusicalColumn",
+               /* doc */ "Creates MeasureGrouping to indicate beat subdivision.",
+               /* create */ "MeasureGrouping",
+               /* accept */ "",
+               /* read */ "beatGrouping beatLength measurePosition currentMusicalColumn",
                /* write */ "");