Add penalty to interface.

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

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index ae0586e39f53f05fd94c7c426b656a9160e0fc3f..ecdcc3cd0edcdb03e9b2ab674a092467c228f8b7 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -56,7 +56,7 @@ Staff_symbol_referencer::line_thickness (Grob *me)
   Grob *st = get_staff_symbol (me);
   if (st)
     return Staff_symbol::get_line_thickness (st);
-  return me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  return me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
 }
 
 Real
@@ -77,6 +77,11 @@ Staff_symbol_referencer::get_position (Grob *me)
   return robust_scm2double (me->get_property ("staff-position"), p);
 }
 
+int
+Staff_symbol_referencer::get_rounded_position (Grob*me)
+{
+  return int (rint (get_position (me)));
+}
 
 LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position",
           1, 0,0, (SCM sg),
@@ -88,9 +93,9 @@ LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position",
   Real pos = Staff_symbol_referencer::get_position (g);
 
   if (fabs (rint (pos) -pos) < 1e-6) // ugh.
-    return gh_int2scm ((int) my_round (pos));
+    return scm_int2num ((int) my_round (pos));
   else
-    return gh_double2scm (pos);
+    return scm_make_real (pos);
 }
 
 
@@ -103,14 +108,14 @@ Staff_symbol_referencer::callback (SCM element_smob, SCM)
 
   SCM pos = me->get_property ("staff-position");
   Real off = 0.0;
-  if (gh_number_p (pos))
+  if (is_number (pos))
     {
       Real space = Staff_symbol_referencer::staff_space (me);
-      off = gh_scm2double (pos) * space / 2.0;
-      me->set_property ("staff-position", gh_int2scm (0));
+      off = ly_scm2double (pos) * space / 2.0;
+      me->set_property ("staff-position", scm_int2num (0));
     }
 
-  return gh_double2scm (off);
+  return scm_make_real (off);
 }
 
 /*  This sets the position relative to the center of the staff symbol.
@@ -132,10 +137,10 @@ Staff_symbol_referencer::set_position (Grob *me, Real p)
   if (st && me->common_refpoint (st, Y_AXIS))
     {
       Real oldpos = get_position (me);
-      me->set_property ("staff-position", gh_double2scm (p - oldpos));
+      me->set_property ("staff-position", scm_make_real (p - oldpos));
     }
   else
-    me->set_property ("staff-position", gh_double2scm (p));
+    me->set_property ("staff-position", scm_make_real (p));
 
   if (!me->has_offset_callback (Staff_symbol_referencer::callback_proc,
                                Y_AXIS))
@@ -163,3 +168,4 @@ ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface",
               "in their @code{Y-offset-callbacks}. "
               ,
               "staff-position");
+