lilypond-manuals.css: edit color scheme and some spacing

[lilypond.git] / lily / measure-grouping-engraver.cc

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index c61dd74c45f2188b4eb52ced9d435dd8284e8b1d..c91fdc63418f748af80fdd4ddd0a421758226520 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2015 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
@@ -22,7 +22,6 @@
 #include "global-context.hh"
 #include "engraver.hh"
 #include "spanner.hh"
-#include "beam-settings.hh"
 
 #include "translator.icc"
 
@@ -37,7 +36,7 @@ protected:
 
   void process_music ();
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER (note_column);
+  void acknowledge_note_column (Grob_info);
 };
 
 void
@@ -45,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;
     }
@@ -65,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;
     }
@@ -73,76 +72,73 @@ 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 = 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,
-            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, 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,
-               /* 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 */
+                ""
+               );