X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-engraver.cc;h=4e6238bedf35859f456933059ca9f06db9f2c362;hb=59c4bbfd0af56c1def7e1f923f8fd979fbef23d9;hp=bd25a47df4f2ac6c6c439322e9d4b54c55448aa2;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index bd25a47df4..4e6238bedf 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -55,11 +55,11 @@ protected:
   virtual bool try_music (Music*);
   virtual void process_music ();
 
-  virtual bool valid_start_point();
+  virtual bool valid_start_point ();
   virtual bool valid_end_point ();
   
 public:
-  TRANSLATOR_DECLARATIONS(Beam_engraver);
+  TRANSLATOR_DECLARATIONS (Beam_engraver);
 };
 
 
@@ -68,7 +68,7 @@ public:
   always nested.
  */
 bool
-Beam_engraver::valid_start_point()
+Beam_engraver::valid_start_point ()
 {
   Moment n = now_mom ();
 
@@ -76,7 +76,7 @@ Beam_engraver::valid_start_point()
 }
 
 bool
-Beam_engraver::valid_end_point()
+Beam_engraver::valid_end_point ()
 {
   return valid_start_point ();
 }
@@ -97,7 +97,7 @@ Beam_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("beam-event"))
     {
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
+      Direction d = to_dir (m->get_property ("span-direction"));
       if (d == START && !valid_start_point ())
 	return false;
       if (d == STOP && !valid_end_point ())
@@ -121,7 +121,7 @@ Beam_engraver::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-    daddy_context_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
@@ -142,7 +142,7 @@ Beam_engraver::process_music ()
 
       set_melisma (true);
       prev_start_ev_ = start_ev_;
-      beam_ = make_spanner ("Beam");
+      beam_ = make_spanner ("Beam", start_ev_->self_scm ());
       SCM smp = get_property ("measurePosition");
       Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
 
@@ -152,7 +152,6 @@ Beam_engraver::process_music ()
       beam_info_ = new Beaming_info_list;
       
       /* urg, must copy to Auto_beam_engraver too */
-      announce_grob (beam_, start_ev_->self_scm());
     }
 
 }
@@ -163,9 +162,9 @@ Beam_engraver::typeset_beam ()
 {
   if (finished_beam_)
     {
-      finished_beam_info_->beamify(beat_length_, subdivide_beams_);
+      finished_beam_info_->beamify (beat_length_, subdivide_beams_);
       Beam::set_beaming (finished_beam_, finished_beam_info_);
-      typeset_grob (finished_beam_);
+      
       delete finished_beam_info_;
       finished_beam_info_ =0;
       finished_beam_ = 0;
@@ -181,7 +180,7 @@ Beam_engraver::start_translation_timestep ()
     {
       set_melisma (true);
       
-      subdivide_beams_ = to_boolean(get_property("subdivideBeams"));
+      subdivide_beams_ = to_boolean (get_property ("subdivideBeams"));
       beat_length_ = *unsmob_moment (get_property ("beatLength"));
     }
 }
@@ -198,7 +197,7 @@ Beam_engraver::stop_translation_timestep ()
       now_stop_ev_ = 0;
       beam_ = 0;
       beam_info_ = 0;
-      typeset_beam();
+      typeset_beam ();
       set_melisma (false);
     }
 }
@@ -230,7 +229,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 	}
       else if (Stem::has_interface (info.grob_))
 	{
-	  Moment now = now_mom();
+	  Moment now = now_mom ();
 
 	  if (!valid_start_point ())
 	    return ;
@@ -239,7 +238,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 	  if (Stem::get_beam (stem))
 	    return;
 
-	  Music* m = info.music_cause();
+	  Music* m = info.music_cause ();
 	  if (!m->is_mus_type ("rhythmic-event"))
 	    {
 	      String s = _ ("stem must have Rhythmic structure");
@@ -253,7 +252,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 
 
 	  last_stem_added_at_ = now;
-	  int durlog  = unsmob_duration (m->get_mus_property ("duration"))-> duration_log ();
+	  int durlog  = unsmob_duration (m->get_property ("duration"))-> duration_log ();
 	  if (durlog <= 2)
 	    {
 	      m->origin ()->warning (_ ("stem doesn't fit in beam"));
@@ -265,7 +264,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 	      */
 	    }
 
-	  stem->set_grob_property ("duration-log",
+	  stem->set_property ("duration-log",
 				    scm_int2num (durlog));
 	  Moment stem_location = now - beam_start_mom_ + beam_start_location_;
 	  beam_info_->add_stem (stem_location,
@@ -279,7 +278,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 
 
 
-ENTER_DESCRIPTION(Beam_engraver,
+ENTER_DESCRIPTION (Beam_engraver,
 /* descr */       "Handles Beam events by engraving Beams.    If omitted, then notes will be "
 "printed with flags instead of beams.",
 /* creats*/       "Beam",
@@ -292,19 +291,19 @@ ENTER_DESCRIPTION(Beam_engraver,
 class Grace_beam_engraver : public Beam_engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Grace_beam_engraver);  
+  TRANSLATOR_DECLARATIONS (Grace_beam_engraver);  
 
 protected:
-  virtual bool valid_start_point();
+  virtual bool valid_start_point ();
   virtual bool valid_end_point ();
 };
 
-Grace_beam_engraver::Grace_beam_engraver()
+Grace_beam_engraver::Grace_beam_engraver ()
 {
 }
 
 bool
-Grace_beam_engraver::valid_start_point()
+Grace_beam_engraver::valid_start_point ()
 {
   Moment n = now_mom ();
 
@@ -320,7 +319,7 @@ Grace_beam_engraver::valid_end_point ()
 
 
 
-ENTER_DESCRIPTION(Grace_beam_engraver,
+ENTER_DESCRIPTION (Grace_beam_engraver,
 /* descr */       "Handles Beam events by engraving Beams.  If omitted, then notes will "
 "be printed with flags instead of beams. Only engraves beams when we "
 " are at grace points in time. "