X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=9fbe6f8b4387c9f8838f4bcea2006447d9d9bd54;hb=14d0e70efc16bfb71c1a235e22b43262942f1674;hp=c8340ecb6059f7a82443d9db7fc3702e0df5d4fb;hpb=6817805afca5e84e74479bdd951609b80210095b;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index c8340ecb60..9fbe6f8b43 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -10,7 +10,7 @@
 
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "libc-extension.hh"
 
 
@@ -27,6 +27,10 @@ Staff_symbol_referencer::on_staffline (Grob *me)
   return on_staffline (me, (int) rint (get_position (me)));
 }
 
+/*
+  This does not take size into account.
+  maybe rename: on_virtual_staffline, on_staff_or_ledger_line?
+ */
 bool
 Staff_symbol_referencer::on_staffline (Grob *me, int pos)
 {
@@ -37,6 +41,9 @@ Staff_symbol_referencer::on_staffline (Grob *me, int pos)
 Grob*
 Staff_symbol_referencer::get_staff_symbol (Grob *me)
 {
+  if (Staff_symbol::has_interface (me))
+    return me;
+  
   SCM st = me->get_property ("staff-symbol");
   return unsmob_grob (st);
 }
@@ -56,7 +63,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
@@ -73,14 +80,22 @@ Staff_symbol_referencer::get_position (Grob *me)
       p += 2.0 * y / Staff_symbol::staff_space (st);
       return p;
     }
-
+  else if (!st)
+    {
+      return me->relative_coordinate (me->get_parent (Y_AXIS), Y_AXIS) * 2;
+    }
   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),
-	   "Return the Y-position of this grob relative to the staff.")
+	   "Return the Y-position of @var{sg} relative to the staff.")
 {
   Grob *g = unsmob_grob (sg);
 
@@ -88,9 +103,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,19 +118,19 @@ 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 (ly_c_number_p (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.
 
-The function is hairy, because it can be callled in two situations:
+The function is hairy, because it can be called in two situations:
 
 1. There is no staff yet; we must set staff-position
 
@@ -132,14 +147,12 @@ 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))
-    me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS);
+  me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS);
 }
 
 /* Half of the height, in staff space, i.e. 2.0 for a normal staff. */
@@ -163,3 +176,4 @@ ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface",
 	       "in their @code{Y-offset-callbacks}. "
 	       ,
 	       "staff-position");
+