* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

[lilypond.git] / lily / beam-engraver.cc

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 07c2c9046a14da00ebb5ffc62df859ca14142159..9b4e01a139bd202097f35421990258f6bd14274f 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -24,8 +24,8 @@
 class Beam_engraver : public Engraver
 {
 public:
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rest);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rest);
 protected:
   Music *start_ev_;
 
@@ -106,13 +106,9 @@ Beam_engraver::try_music (Music *m)
        return false;
 
       if (d == START)
-       {
-         start_ev_ = m;
-       }
+       start_ev_ = m;
       else if (d == STOP)
-       {
-         now_stop_ev_ = m;
-       }
+       now_stop_ev_ = m;
       return true;
     }
   return false;
@@ -130,9 +126,7 @@ void
 Beam_engraver::process_music ()
 {
   if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
-    {
-      get_score_engraver ()->forbid_breaks ();
-    }
+    get_score_engraver ()->forbid_breaks ();
 
   if (start_ev_)
     {
@@ -221,7 +215,10 @@ void
 Beam_engraver::acknowledge_rest (Grob_info info)
 {
   if (beam_)
-    info.grob ()->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
+    {
+      chain_offset_callback (info.grob(),
+                            Beam::rest_collision_callback_proc, Y_AXIS);
+    }
 }
 
 void
@@ -264,7 +261,7 @@ Beam_engraver::acknowledge_stem (Grob_info info)
        }
 
       stem->set_property ("duration-log",
-                         scm_int2num (durlog));
+                         scm_from_int (durlog));
       Moment stem_location = now - beam_start_mom_ + beam_start_location_;
       beam_info_->add_stem (stem_location,
                            max (durlog- 2, 0));
@@ -272,15 +269,15 @@ Beam_engraver::acknowledge_stem (Grob_info info)
     }
 }
 
-ADD_ACKNOWLEDGER(Beam_engraver, stem);
-ADD_ACKNOWLEDGER(Beam_engraver, rest);
+ADD_ACKNOWLEDGER (Beam_engraver, stem);
+ADD_ACKNOWLEDGER (Beam_engraver, rest);
 
 ADD_TRANSLATOR (Beam_engraver,
-               /* descr */ "Handles Beam events by engraving Beams.    If omitted, then notes will be "
+               /* doc */ "Handles Beam events by engraving Beams.    If omitted, then notes will be "
                "printed with flags instead of beams.",
-               /* creats*/ "Beam",
-               /* accepts */ "beam-event",
-               /* reads */ "beamMelismaBusy beatLength subdivideBeams",
+               /* create */ "Beam",
+               /* accept */ "beam-event",
+               /* read */ "beamMelismaBusy beatLength subdivideBeams",
                /* write */ "");
 
 class Grace_beam_engraver : public Beam_engraver
@@ -311,14 +308,14 @@ Grace_beam_engraver::valid_end_point ()
   return beam_ && valid_start_point ();
 }
 
-ADD_ACKNOWLEDGER(Grace_beam_engraver, stem);
-ADD_ACKNOWLEDGER(Grace_beam_engraver, rest);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
 ADD_TRANSLATOR (Grace_beam_engraver,
-               /* descr */ "Handles Beam events by engraving Beams.  If omitted, then notes will "
+               /* doc */ "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. ",
-               /* creats*/ "Beam",
-               /* accepts */ "beam-event",
-               /* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
+               /* create */ "Beam",
+               /* accept */ "beam-event",
+               /* read */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
                /* write */ "");