X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=91e9f6957df616ca54a764e7fda28f324be1616b;hb=f8159a57125bbf52e96cad584d6c3756a39d5fc9;hp=81d3c5584e7297b28938099c22710c6559f9d331;hpb=ecf2b5e9dcfa7654803fb0050d7127e0ec7fd934;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 81d3c5584e..91e9f6957d 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2007 Han-Wen Nienhuys <hanwen@xs4all.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"
@@ -61,18 +72,18 @@ 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"));
       Rational mp = measpos->main_part_;
 
-      Moment *beatlen_mom = unsmob_moment (get_property ("beatLength"));
-      Rational beat_length = beatlen_mom->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))) * beat_length,
+	   where += Rational ((int) scm_to_int (scm_car (s))) * base_moment,
 	     s = scm_cdr (s))
 	{
 	  int grouplen = scm_to_int (scm_car (s));
@@ -83,19 +94,21 @@ Measure_grouping_engraver::process_music ()
 		  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")));
 
-	      grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
-	      grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
-
-	      stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * beat_length;
-	      get_global_context ()->add_moment_to_process (Moment (stop_grouping_mom_));
+	         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"));
+	         if (grouplen == 3)
+		   grouping_->set_property ("style", ly_symbol2scm ("triangle"));
+	         else
+		   grouping_->set_property ("style", ly_symbol2scm ("bracket"));
 
-	      break;
+	         break;
+               }
 	    }
 	}
     }
@@ -115,10 +128,10 @@ ADD_TRANSLATOR (Measure_grouping_engraver,
 		"MeasureGrouping ",
 
 		/* read */
-		"beatLength "
+                "baseMoment "
+		"beatStructure "
 		"currentMusicalColumn "
-		"measurePosition "
-		"beatGrouping ",
+		"measurePosition ",
 
 		/* write */
 		""