* 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 c36ed795d0eb143dfbc1e95f146f986ad088582c..9b4e01a139bd202097f35421990258f6bd14274f 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -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