X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=84da38886143de09402494bddf72002dcf331e22;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=d77cf8d499e6384661c88571a25734839c54e472;hpb=b25edb663270422d689442336c84269acbbb127e;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index d77cf8d499..84da388861 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2009 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,7 +22,6 @@
 #include "global-context.hh"
 #include "engraver.hh"
 #include "spanner.hh"
-#include "beam-settings.hh"
 
 #include "translator.icc"
 
@@ -34,7 +44,7 @@ Measure_grouping_engraver::finalize ()
 {
   if (grouping_)
     {
-      grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      grouping_->set_bound (RIGHT, Grob::unsmob (get_property ("currentCommandColumn")));
       grouping_->suicide ();
       grouping_ = 0;
     }
@@ -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")));
+                            Grob::unsmob (get_property ("currentMusicalColumn")));
 
       grouping_ = 0;
     }
@@ -62,54 +72,45 @@ Measure_grouping_engraver::process_music ()
   if (now.grace_part_)
     return;
 
-  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 ("*"));
-    }
+  SCM grouping = get_property ("beatStructure");
   if (scm_is_pair (grouping))
     {
-      Moment *measpos = unsmob_moment (get_property ("measurePosition"));
+      Moment *measpos = Moment::unsmob (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 = Moment::unsmob (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,
-	     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;
-		}
+           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) * 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"));
-
-	         break;
-               }
-	    }
-	}
+                {
+                  grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
+                  grouping_->set_bound (LEFT, Grob::unsmob (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;
+                }
+            }
+        }
     }
 }
 
@@ -120,18 +121,18 @@ Measure_grouping_engraver::Measure_grouping_engraver ()
 
 ADD_ACKNOWLEDGER (Measure_grouping_engraver, note_column);
 ADD_TRANSLATOR (Measure_grouping_engraver,
-		/* doc */
-		"Create @code{MeasureGrouping} to indicate beat subdivision.",
+                /* doc */
+                "Create @code{MeasureGrouping} to indicate beat subdivision.",
 
-		/* create */
-		"MeasureGrouping ",
+                /* create */
+                "MeasureGrouping ",
 
-		/* read */
-		"beatLength "
-		"currentMusicalColumn "
-		"measurePosition "
-		"beamSettings ",
+                /* read */
+                "baseMoment "
+                "beatStructure "
+                "currentMusicalColumn "
+                "measurePosition ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );