From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 13 Jun 2006 11:22:10 +0000 (+0000)
Subject: (y_offset_callback): bugfix: decide position
X-Git-Tag: cvs/HEAD~300
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=585959e4a373db9658d84ace8f3d4f4f6af7b190;p=lilypond.git

(y_offset_callback): bugfix: decide position
override based on scm_is_number(). Fixes \rest on center staff
line
---

diff --git a/ChangeLog b/ChangeLog
index c125b3fc40..db2d33695f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-06-13  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* lily/rest.cc (y_offset_callback): bugfix: decide position
+	override based on scm_is_number(). Fixes \rest on center staff
+	line
+
 	* lily/beaming-pattern.cc (best_splitpoint_index): fix beaming
 	patterns for 16th triplets.
 
diff --git a/lily/rest.cc b/lily/rest.cc
index b274aab872..d7351d648a 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -27,9 +27,9 @@ Rest::y_offset_callback (SCM smob)
   int line_count = Staff_symbol_referencer::line_count (me);
   Real ss = Staff_symbol_referencer::staff_space (me);
 
+  bool position_override = scm_is_number (me->get_property ("staff-position"));
   Real amount = robust_scm2double (me->get_property ("staff-position"), 0)
     * 0.5 * ss;
-  bool position_override = amount;
   
   if (line_count % 2)
     {