From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Oct 2006 18:51:49 +0000 (+0000)
Subject: don't set callback if staff-position set. Fixes #126.
X-Git-Tag: release/2.10.0-2~53^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ce6e56a8510206bff0d329bb79b9c0211999636f;p=lilypond.git

don't set callback if staff-position set. Fixes #126.
---

diff --git a/input/regression/rest-pitched-beam.ly b/input/regression/rest-pitched-beam.ly
new file mode 100644
index 0000000000..6532b88927
--- /dev/null
+++ b/input/regression/rest-pitched-beam.ly
@@ -0,0 +1,11 @@
+\header {
+
+  texidoc = "Pitched rests under beams."
+
+}
+
+\version "2.9.26"
+
+\relative c'{
+  a\rest a8[ a\rest b] |
+}
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 4501519136..cad443299c 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -206,7 +206,8 @@ Beam_engraver::finalize ()
 void
 Beam_engraver::acknowledge_rest (Grob_info info)
 {
-  if (beam_)
+  if (beam_
+      && !scm_is_number (info.grob ()->get_property_data ("staff-position")))
     {
       chain_offset_callback (info.grob(),
 			     Beam::rest_collision_callback_proc, Y_AXIS);