(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 c125b3fc402b8ce49c844a7b14b22f2364818781..db2d33695f938169b2b63f1a5f63b540a4606a3a 100644 (file)
--- 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 b274aab8725d90ab16f73616fdf7e0228e949dfd..d7351d648aebf3ce7583876bb1bf8a6bac9ea2b3 100644 (file)
--- 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)
     {