X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=03192a1defd611e1895b2e53cbe614a0437540bc;hb=e434a44b5d693cba78b5debb929a76da4c744981;hp=05ce7072a7f691bb7fc8d556886bd31327183b68;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 05ce7072a7..03192a1def 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -3,13 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
 #include "side-position-interface.hh"
 #include "global-context.hh"
 #include "engraver.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
 
 class Measure_grouping_engraver : public Engraver
 {
@@ -20,9 +23,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 +40,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
@@ -66,12 +67,12 @@ Measure_grouping_engraver::process_music ()
       Moment *measpos = unsmob_moment (get_property ("measurePosition"));
       Rational mp = measpos->main_part_;
 
-      Moment *beatlen = unsmob_moment (get_property ("beatLength"));
-      Rational bl = beatlen->main_part_;
+      Moment *beatlen_mom = unsmob_moment (get_property ("beatLength"));
+      Rational beat_length = beatlen_mom->main_part_;
 
       Rational where (0);
       for (SCM s = grouping; scm_is_pair (s);
-	   where += Rational ((int) scm_to_int (scm_car (s))) * bl,
+	   where += Rational ((int) scm_to_int (scm_car (s))) * beat_length,
 	     s = scm_cdr (s))
 	{
 	  int grouplen = scm_to_int (scm_car (s));
@@ -79,14 +80,14 @@ Measure_grouping_engraver::process_music ()
 	    {
 	      if (grouping_)
 		{
-		  programming_error ("Huh, last grouping not finished yet.");
+		  programming_error ("last grouping not finished yet");
 		  continue;
 		}
 
 	      grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
 	      grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
 
-	      stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * bl;
+	      stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * beat_length;
 	      get_global_context ()->add_moment_to_process (Moment (stop_grouping_mom_));
 
 	      if (grouplen == 3)
@@ -99,15 +100,26 @@ 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",
-		/* write */ "");
+		/* doc */
+		"Create @code{MeasureGrouping} to indicate beat subdivision.",
+
+		/* create */
+		"MeasureGrouping ",
+
+		/* read */
+		"beatLength "
+		"currentMusicalColumn "
+		"measurePosition "
+		"beatGrouping ",
+
+		/* write */
+		""
+		);