Run `make grand-replace'.

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

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index bda7ed0bda33098e1239643b47696dc6fc6a4f8e..addbc5f454d00f4d94ba293856e543d9e91f5e5f 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,15 +1,18 @@
-/*   
-  measure-grouping-engraver.cc --  implement Measure_grouping_engraver
+/*
+  measure-grouping-engraver.cc -- implement Measure_grouping_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+  (c) 2002--2008 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
 {
@@ -17,12 +20,12 @@ public:
   TRANSLATOR_DECLARATIONS (Measure_grouping_engraver);
 
 protected:
-  Spanner * grouping_;
+  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
@@ -32,18 +35,15 @@ Measure_grouping_engraver::finalize ()
     {
       grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
       grouping_->suicide ();
-      grouping_= 0;
+      grouping_ = 0;
     }
 }
 
-
 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
@@ -54,64 +54,72 @@ Measure_grouping_engraver::process_music ()
     {
       grouping_->set_bound (RIGHT,
                            unsmob_grob (get_property ("currentMusicalColumn")));
-      
+
       grouping_ = 0;
     }
-  
+
   if (now.grace_part_)
-    return; 
-  
+    return;
+
   SCM grouping = get_property ("beatGrouping");
   if (scm_is_pair (grouping))
     {
       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,
-          s = scm_cdr (s)
-          )
+          where += Rational ((int) scm_to_int (scm_car (s))) * beat_length,
+            s = scm_cdr (s))
        {
          int grouplen = scm_to_int (scm_car (s));
          if (where == mp)
            {
              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)
                grouping_->set_property ("style", ly_symbol2scm ("triangle"));
              else
                grouping_->set_property ("style", ly_symbol2scm ("bracket"));
-             
-             break ; 
+
+             break;
            }
        }
     }
 }
+
 Measure_grouping_engraver::Measure_grouping_engraver ()
 {
   grouping_ = 0;
 }
 
-ENTER_DESCRIPTION (Measure_grouping_engraver,
-/* descr */       "Creates MeasureGrouping to indicate beat subdivision.",
-/* creats*/       "MeasureGrouping",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "beatGrouping beatLength measurePosition currentMusicalColumn",
-/* write */       "");
+ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column);
+ADD_TRANSLATOR (Measure_grouping_engraver,
+               /* doc */
+               "Create @code{MeasureGrouping} to indicate beat subdivision.",
+
+               /* create */
+               "MeasureGrouping ",
+
+               /* read */
+               "beatLength "
+               "currentMusicalColumn "
+               "measurePosition "
+               "beatGrouping ",
+
+               /* write */
+               ""
+               );