new file.

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

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 6e54748f856d049d32196db951833cf96c436343..4dd57300a37aebfcd856d028802367fad8e65f1d 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,12 +1,11 @@
 /*   
-  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
-#include "spanner.hh"
 #include "warn.hh"
 #include "side-position-interface.hh"
 #include "global-context.hh"
@@ -32,9 +31,8 @@ Measure_grouping_engraver::finalize ()
   if (grouping_)
     {
       grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-      typeset_grob (grouping_);
       grouping_->suicide ();
-      grouping_= 0;
+      grouping_ = 0;
     }
 }
 
@@ -56,7 +54,7 @@ Measure_grouping_engraver::process_music ()
     {
       grouping_->set_bound (RIGHT,
                            unsmob_grob (get_property ("currentMusicalColumn")));
-      typeset_grob (grouping_);
+      
       grouping_ = 0;
     }
   
@@ -64,7 +62,7 @@ Measure_grouping_engraver::process_music ()
     return; 
   
   SCM grouping = get_property ("beatGrouping");
-  if (ly_c_pair_p (grouping))
+  if (scm_is_pair (grouping))
     {
       Moment *measpos = unsmob_moment (get_property ("measurePosition"));
       Rational mp = measpos->main_part_;
@@ -73,12 +71,12 @@ Measure_grouping_engraver::process_music ()
       Rational bl = beatlen->main_part_;
        
       Rational where (0);
-      for (SCM s = grouping; ly_c_pair_p (s);
-          where += Rational (ly_scm2int (ly_car (s))) * bl,
-          s = ly_cdr (s)
+      for (SCM s = grouping; scm_is_pair (s);
+          where += Rational ((int) scm_to_int (scm_car (s))) * bl,
+          s = scm_cdr (s)
           )
        {
-         int grouplen = ly_scm2int (ly_car (s));
+         int grouplen = scm_to_int (scm_car (s));
          if (where == mp)
            {
              if (grouping_)
@@ -110,8 +108,8 @@ Measure_grouping_engraver::Measure_grouping_engraver ()
   grouping_ = 0;
 }
 
-ENTER_DESCRIPTION (Measure_grouping_engraver,
-/* descr */       "Creates Measure_grouping objects using beatGrouping property",
+ADD_TRANSLATOR (Measure_grouping_engraver,
+/* descr */       "Creates MeasureGrouping to indicate beat subdivision.",
 /* creats*/       "MeasureGrouping",
 /* accepts */     "",
 /* acks  */      "note-column-interface",