X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=c91fdc63418f748af80fdd4ddd0a421758226520;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c55bf2fee0a8cec5cee92ff3015cb044b2bc10fb;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index c55bf2fee0..c91fdc6341 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,15 +1,27 @@
 /*
-  measure-grouping-engraver.cc -- implement Measure_grouping_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "warn.hh"
 #include "side-position-interface.hh"
 #include "global-context.hh"
 #include "engraver.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -22,9 +34,9 @@ protected:
   Spanner *grouping_;
   Rational stop_grouping_mom_;
 
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void process_music ();
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  void acknowledge_note_column (Grob_info);
 };
 
 void
@@ -32,7 +44,7 @@ Measure_grouping_engraver::finalize ()
 {
   if (grouping_)
     {
-      grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      grouping_->set_bound (RIGHT, unsmob<Grob> (get_property ("currentCommandColumn")));
       grouping_->suicide ();
       grouping_ = 0;
     }
@@ -42,9 +54,7 @@ void
 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,7 +64,7 @@ Measure_grouping_engraver::process_music ()
   if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_)
     {
       grouping_->set_bound (RIGHT,
-			    unsmob_grob (get_property ("currentMusicalColumn")));
+                            unsmob<Grob> (get_property ("currentMusicalColumn")));
 
       grouping_ = 0;
     }
@@ -62,55 +72,73 @@ Measure_grouping_engraver::process_music ()
   if (now.grace_part_)
     return;
 
-  SCM grouping = get_property ("beatGrouping");
+  SCM grouping = get_property ("beatStructure");
   if (scm_is_pair (grouping))
     {
-      Moment *measpos = unsmob_moment (get_property ("measurePosition"));
+      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 *base_mom = unsmob<Moment> (get_property ("baseMoment"));
+      Rational base_moment = base_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))
-	{
-	  int grouplen = scm_to_int (scm_car (s));
-	  if (where == mp)
-	    {
-	      if (grouping_)
-		{
-		  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;
-	      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;
-	    }
-	}
+           where += Rational ((int) scm_to_int (scm_car (s))) * base_moment,
+           s = scm_cdr (s))
+        {
+          int grouplen = scm_to_int (scm_car (s));
+          if (where == mp)
+            {
+              if (grouping_)
+                {
+                  programming_error ("last grouping not finished yet");
+                  continue;
+                }
+              if (grouplen > 1)
+                {
+                  grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
+                  grouping_->set_bound (LEFT, unsmob<Grob> (get_property ("currentMusicalColumn")));
+
+                  stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * base_moment;
+                  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;
+                }
+            }
+        }
     }
 }
 
-Measure_grouping_engraver::Measure_grouping_engraver ()
+Measure_grouping_engraver::Measure_grouping_engraver (Context *c)
+  : Engraver (c)
 {
   grouping_ = 0;
 }
 
-ADD_ACKNOWLEDGER(Measure_grouping_engraver, note_column);
+void
+Measure_grouping_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column);
+}
+
 ADD_TRANSLATOR (Measure_grouping_engraver,
-		/* descr */ "Creates MeasureGrouping to indicate beat subdivision.",
-		/* creats*/ "MeasureGrouping",
-		/* accepts */ "",
-		/* reads */ "beatGrouping beatLength measurePosition currentMusicalColumn",
-		/* write */ "");
+                /* doc */
+                "Create @code{MeasureGrouping} to indicate beat subdivision.",
+
+                /* create */
+                "MeasureGrouping ",
+
+                /* read */
+                "baseMoment "
+                "beatStructure "
+                "currentMusicalColumn "
+                "measurePosition ",
+
+                /* write */
+                ""
+               );