X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=addbc5f454d00f4d94ba293856e543d9e91f5e5f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6cebd1f42f3e2bca0a2a1a8773f1bfea5708a405;hpb=a0a40c02de757661518577105dbb644a6ecdbc4d;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 6cebd1f42f..addbc5f454 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,118 +1,125 @@
-/*   
-  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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include "score-engraver.hh"
-#include "spanner.hh"
 #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
 {
 public:
-  TRANSLATOR_DECLARATIONS(Measure_grouping_engraver);
+  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
-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;
+      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
 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;
     }
-  
+
   if (now.grace_part_)
-    return; 
-  
+    return;
+
   SCM grouping = get_property ("beatGrouping");
-  if (gh_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"));
-      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; gh_pair_p (s);
-	   where += Rational (gh_scm2int (gh_car (s))) * bl,
-	   s = gh_cdr (s)
-	   )
+      for (SCM s = grouping; scm_is_pair (s);
+	   where += Rational ((int) scm_to_int (scm_car (s))) * beat_length,
+	     s = scm_cdr (s))
 	{
-	  int grouplen = gh_scm2int (gh_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_ = new Spanner (get_property ("MeasureGrouping"));
-	      grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
-	      announce_grob (grouping_, SCM_EOL);
 
+	      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 ;
-	      top_engraver ()->add_moment_to_process (Moment (stop_grouping_mom_));
+	      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_grob_property ("type", ly_symbol2scm ("triangle"));
+		grouping_->set_property ("style", ly_symbol2scm ("triangle"));
 	      else
-		grouping_->set_grob_property ("type", ly_symbol2scm ("bracket"));
-	      
-	      break ; 
+		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",
-/* 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 */
+		""
+		);