X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=c61dd74c45f2188b4eb52ced9d435dd8284e8b1d;hb=ed430e2d3a44b70a0ee7b32f7dd2002bc6c6912b;hp=fe7abf1ea4a137d1bfbd01f04483815fc287957b;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index fe7abf1ea4..c61dd74c45 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--2006 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"
@@ -11,6 +22,7 @@
 #include "global-context.hh"
 #include "engraver.hh"
 #include "spanner.hh"
+#include "beam-settings.hh"
 
 #include "translator.icc"
 
@@ -61,7 +73,16 @@ Measure_grouping_engraver::process_music ()
   if (now.grace_part_)
     return;
 
-  SCM grouping = get_property ("beatGrouping");
+  SCM settings = get_property ("beamSettings");
+  SCM grouping = SCM_EOL;
+  if (scm_is_pair (settings))
+    {
+      SCM time_signature_fraction = get_property ("timeSignatureFraction");
+      grouping = ly_beam_grouping (settings,
+                                   time_signature_fraction,
+                                   ly_symbol2scm ("end"),
+                                   ly_symbol2scm ("*"));
+    }
   if (scm_is_pair (grouping))
     {
       Moment *measpos = unsmob_moment (get_property ("measurePosition"));
@@ -83,19 +104,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) * beat_length;
-	      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;
+               }
 	    }
 	}
     }
@@ -109,14 +132,17 @@ Measure_grouping_engraver::Measure_grouping_engraver ()
 ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column);
 ADD_TRANSLATOR (Measure_grouping_engraver,
 		/* doc */
-		"Creates MeasureGrouping to indicate beat subdivision.",
+		"Create @code{MeasureGrouping} to indicate beat subdivision.",
+
 		/* create */
-		"MeasureGrouping",
+		"MeasureGrouping ",
+
 		/* read */
 		"beatLength "
 		"currentMusicalColumn "
 		"measurePosition "
-		"beatGrouping "
-		,
+		"beamSettings ",
+
 		/* write */
-		"");
+		""
+		);