* lily/lily-guile.cc (robust_scm2double): new function. Use throughout.

[lilypond.git] / lily / staff-symbol-referencer.cc

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 47e6977ff827ff89a35c1296223a2312b5adc89a..0ce4f1aa0a0bf8456ebbe4193058b9ed2351ba75 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -64,14 +64,8 @@ Staff_symbol_referencer::get_position (Grob*me)
 
       p += 2.0 * y / Staff_symbol::staff_space (st);
     }
-  else
-    {
-      SCM pos = me->get_grob_property ("staff-position");
-      if (gh_number_p (pos))
-       return gh_scm2double (pos);
-    }
-  
-  return  p;
+
+  return robust_scm2double ( me->get_grob_property ("staff-position"), p);
 }