X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=2ee9054c8138841ff05f8d2e1882f73819e0696f;hb=81f1a254d08cbde22d0bac2b366e199a3efebd30;hp=834a7af2d9a7cbd130b85dfc152093f9e5a9d9ff;hpb=4f7187ac9efe404e0c5653fde88ebe972340e9c6;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 834a7af2d9..2ee9054c81 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
-#include "score-engraver.hh"
 #include "spanner.hh"
 #include "warn.hh"
 #include "side-position-interface.hh"
+#include "global-context.hh"
+#include "engraver.hh"
 
 class Measure_grouping_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Measure_grouping_engraver);
+  TRANSLATOR_DECLARATIONS (Measure_grouping_engraver);
 
 protected:
   Spanner * grouping_;
@@ -26,12 +27,11 @@ protected:
 };
 
 void
-Measure_grouping_engraver::finalize()
+Measure_grouping_engraver::finalize ()
 {
   if (grouping_)
     {
       grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-      typeset_grob (grouping_);
       grouping_->suicide ();
       grouping_= 0;
     }
@@ -50,12 +50,12 @@ Measure_grouping_engraver::acknowledge_grob (Grob_info gi)
 void
 Measure_grouping_engraver::process_music ()
 {
-  Moment now = now_mom();
+  Moment now = now_mom ();
   if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_)
     {
       grouping_->set_bound (RIGHT,
 			    unsmob_grob (get_property ("currentMusicalColumn")));
-      typeset_grob (grouping_);
+      
       grouping_ = 0;
     }
   
@@ -63,7 +63,7 @@ Measure_grouping_engraver::process_music ()
     return; 
   
   SCM grouping = get_property ("beatGrouping");
-  if (gh_pair_p (grouping))
+  if (ly_c_pair_p (grouping))
     {
       Moment *measpos = unsmob_moment (get_property ("measurePosition"));
       Rational mp = measpos->main_part_;
@@ -72,12 +72,12 @@ Measure_grouping_engraver::process_music ()
       Rational bl = beatlen->main_part_;
 	
       Rational where (0);
-      for (SCM s = grouping; gh_pair_p (s);
-	   where += Rational (gh_scm2int (gh_car (s))) * bl,
-	   s = gh_cdr (s)
+      for (SCM s = grouping; ly_c_pair_p (s);
+	   where += Rational (scm_to_int (ly_car (s))) * bl,
+	   s = ly_cdr (s)
 	   )
 	{
-	  int grouplen = gh_scm2int (gh_car(s));
+	  int grouplen = scm_to_int (ly_car (s));
 	  if (where == mp)
 	    {
 	      if (grouping_)
@@ -86,31 +86,31 @@ Measure_grouping_engraver::process_music ()
 		  continue;
 		}
 	      
-	      grouping_ = new Spanner (get_property ("MeasureGrouping"));
+	      grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
 	      grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
-	      announce_grob (grouping_, SCM_EOL);
+	      
 
 
-	      stop_grouping_mom_ = now.main_part_ + Rational(grouplen - 1) * bl ;
-	      top_engraver ()->add_moment_to_process (Moment (stop_grouping_mom_));
+	      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_grob_property ("style", ly_symbol2scm ("triangle"));
+		grouping_->set_property ("style", ly_symbol2scm ("triangle"));
 	      else
-		grouping_->set_grob_property ("style", ly_symbol2scm ("bracket"));
+		grouping_->set_property ("style", ly_symbol2scm ("bracket"));
 	      
 	      break ; 
 	    }
 	}
     }
 }
-Measure_grouping_engraver::Measure_grouping_engraver()
+Measure_grouping_engraver::Measure_grouping_engraver ()
 {
   grouping_ = 0;
 }
 
-ENTER_DESCRIPTION(Measure_grouping_engraver,
-/* descr */       "Creates Measure_grouping objects using beatGrouping property",
+ENTER_DESCRIPTION (Measure_grouping_engraver,
+/* descr */       "Creates MeasureGrouping to indicate beat subdivision.",
 /* creats*/       "MeasureGrouping",
 /* accepts */     "",
 /* acks  */      "note-column-interface",