* scm/stencil.scm (fontify-text): reinstate function

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

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index bbeab818543878ecf9c0276f9a83df27ff12d04f..7c262c33eb9431157ad484ba1f115ef8efcda839 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -3,36 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002 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_;
   Rational stop_grouping_mom_;
 
-  virtual void start_translation_timestep ();
+  virtual void process_music ();
   virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
 };
 
 void
-Measure_grouping_engraver::finalize()
+Measure_grouping_engraver::finalize ()
 {
   if (grouping_)
     {
-      grouping_->set_bound (RIGHT,
-                           unsmob_grob (get_property ("currentCommandColumn")));
-      typeset_grob (grouping_);
+      grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      grouping_->suicide ();
       grouping_= 0;
     }
 }
@@ -48,15 +48,14 @@ Measure_grouping_engraver::acknowledge_grob (Grob_info gi)
 }
 
 void
-Measure_grouping_engraver::start_translation_timestep ()
+Measure_grouping_engraver::process_music ()
 {
-  Moment now = now_mom();
+  Moment now = now_mom ();
   if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_)
     {
-      Side_position_interface::add_staff_support (grouping_);
       grouping_->set_bound (RIGHT,
                            unsmob_grob (get_property ("currentMusicalColumn")));
-      typeset_grob (grouping_);
+      
       grouping_ = 0;
     }
   
@@ -64,7 +63,7 @@ Measure_grouping_engraver::start_translation_timestep ()
     return; 
   
   SCM grouping = get_property ("beatGrouping");
-  if (gh_pair_p (grouping))
+  if (ly_c_pair_p (grouping))
     {
       Moment *measpos = unsmob_moment (get_property ("measurePosition"));
       Rational mp = measpos->main_part_;
@@ -73,12 +72,12 @@ Measure_grouping_engraver::start_translation_timestep ()
       Rational bl = beatlen->main_part_;
        
       Rational where (0);
-      for (SCM s = grouping; gh_pair_p (s);
-          where += Rational (gh_scm2int (gh_car (s))) * bl,
-          s = gh_cdr (s)
+      for (SCM s = grouping; ly_c_pair_p (s);
+          where += Rational (ly_scm2int (ly_car (s))) * bl,
+          s = ly_cdr (s)
           )
        {
-         int grouplen = gh_scm2int (gh_car(s));
+         int grouplen = ly_scm2int (ly_car (s));
          if (where == mp)
            {
              if (grouping_)
@@ -87,30 +86,30 @@ Measure_grouping_engraver::start_translation_timestep ()
                  continue;
                }
              
-             grouping_ = new Spanner (get_property ("MeasureGrouping"));
+             grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
              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 ("type", ly_symbol2scm ("triangle"));
+               grouping_->set_property ("style", ly_symbol2scm ("triangle"));
              else
-               grouping_->set_grob_property ("type", 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 */     "",