X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=9ae9fb818360c57608f1aa6ff22098469036dd69;hb=e1b465ac050fed8f3957c999ec469fda0b66d351;hp=3025e2621ac9dfe5b234116b13695b95855b7189;hpb=a79995a9bd9afb1f45660ee19581d7f0e6b3d6a5;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 3025e2621a..9ae9fb8183 100644
--- 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"
@@ -18,7 +17,7 @@ public:
   TRANSLATOR_DECLARATIONS (Measure_grouping_engraver);
 
 protected:
-  Spanner * grouping_;
+  Spanner *grouping_;
   Rational stop_grouping_mom_;
 
   virtual void process_music ();
@@ -33,11 +32,10 @@ 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)
 {
@@ -55,51 +53,48 @@ 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 (ly_c_pair_p (grouping))
+  if (scm_is_pair (grouping))
     {
       Moment *measpos = unsmob_moment (get_property ("measurePosition"));
       Rational mp = measpos->main_part_;
-      
-      Moment * beatlen = unsmob_moment (get_property ("beatLength"));
+
+      Moment *beatlen = unsmob_moment (get_property ("beatLength"));
       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_)
 		{
-		  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) * bl;
 	      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;
 	    }
 	}
     }
@@ -109,10 +104,10 @@ 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_TRANSLATOR (Measure_grouping_engraver,
+		/* descr */ "Creates MeasureGrouping to indicate beat subdivision.",
+		/* creats*/ "MeasureGrouping",
+		/* accepts */ "",
+		/* acks  */ "note-column-interface",
+		/* reads */ "beatGrouping beatLength measurePosition currentMusicalColumn",
+		/* write */ "");