* lily/staff-symbol.cc (print): span staff-symbol on column

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

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 834a7af2d9a7cbd130b85dfc152093f9e5a9d9ff..67720943c835e5636b7a189b5005dc5a2555adfc 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
-#include "score-engraver.hh"
 #include "spanner.hh"
 #include "warn.hh"
 #include "side-position-interface.hh"
+#include "global-context.hh"
+#include "engraver.hh"
 
 class Measure_grouping_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Measure_grouping_engraver);
+  TRANSLATOR_DECLARATIONS (Measure_grouping_engraver);
 
 protected:
   Spanner * grouping_;
@@ -26,7 +27,7 @@ protected:
 };
 
 void
-Measure_grouping_engraver::finalize()
+Measure_grouping_engraver::finalize ()
 {
   if (grouping_)
     {
@@ -50,7 +51,7 @@ Measure_grouping_engraver::acknowledge_grob (Grob_info gi)
 void
 Measure_grouping_engraver::process_music ()
 {
-  Moment now = now_mom();
+  Moment now = now_mom ();
   if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_)
     {
       grouping_->set_bound (RIGHT,
@@ -77,7 +78,7 @@ Measure_grouping_engraver::process_music ()
           s = gh_cdr (s)
           )
        {
-         int grouplen = gh_scm2int (gh_car(s));
+         int grouplen = gh_scm2int (gh_car (s));
          if (where == mp)
            {
              if (grouping_)
@@ -86,30 +87,30 @@ Measure_grouping_engraver::process_music ()
                  continue;
                }
              
-             grouping_ = new Spanner (get_property ("MeasureGrouping"));
+             grouping_ = make_spanner ("MeasureGrouping");
              grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
              announce_grob (grouping_, SCM_EOL);
 
 
-             stop_grouping_mom_ = now.main_part_ + Rational(grouplen - 1) * bl ;
-             top_engraver ()->add_moment_to_process (Moment (stop_grouping_mom_));
+             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_grob_property ("style", ly_symbol2scm ("triangle"));
+               grouping_->set_property ("style", ly_symbol2scm ("triangle"));
              else
-               grouping_->set_grob_property ("style", ly_symbol2scm ("bracket"));
+               grouping_->set_property ("style", ly_symbol2scm ("bracket"));
              
              break ; 
            }
        }
     }
 }
-Measure_grouping_engraver::Measure_grouping_engraver()
+Measure_grouping_engraver::Measure_grouping_engraver ()
 {
   grouping_ = 0;
 }
 
-ENTER_DESCRIPTION(Measure_grouping_engraver,
+ENTER_DESCRIPTION (Measure_grouping_engraver,
 /* descr */       "Creates Measure_grouping objects using beatGrouping property",
 /* creats*/       "MeasureGrouping",
 /* accepts */     "",