Remove makefile include hack

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

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 87e83fadad1523842f0cddf291c30c0715f6726c..e8ef99f9dd3e180d4e386e2c490fd62f72f465bc 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol-referencer.hh"
 
-
 #include "staff-symbol.hh"
+#include "grob.hh"
 #include "output-def.hh"
 #include "libc-extension.hh"
 
@@ -92,6 +92,25 @@ Staff_symbol_referencer::get_position (Grob *me)
   return robust_scm2double (me->get_property ("staff-position"), p);
 }
 
+
+Interval
+Staff_symbol_referencer::extent_in_staff (Grob *me)
+{
+  Grob *st = get_staff_symbol (me);
+  Grob *c = st ? me->common_refpoint (st, Y_AXIS) : 0;
+
+  Interval retval;
+  if (st && c)
+    {
+      retval  = me->extent (c, Y_AXIS)
+       - st->relative_coordinate (c, Y_AXIS);
+    }
+
+  return retval;
+}
+
+
+
 int
 Staff_symbol_referencer::get_rounded_position (Grob *me)
 {
@@ -156,12 +175,19 @@ compare_position (Grob *const &a, Grob *const &b)
               - Staff_symbol_referencer::get_position ((Grob *) b));
 }
 
-ADD_INTERFACE (Staff_symbol_referencer, "staff-symbol-referencer-interface",
-              "An object whose Y position is meant relative to a staff "
-              "symbol. "
-              "These usually have @code{Staff_symbol_referencer::callback} "
-              "in their @code{Y-offset-callbacks}. ",
+bool
+position_less (Grob *const &a, Grob *const &b)
+{
+  return Staff_symbol_referencer::get_position (a)
+    < Staff_symbol_referencer::get_position (b);
+}
 
-              /* properties */
-              "staff-position");
+ADD_INTERFACE (Staff_symbol_referencer,
+              "An object whose Y@tie{}position is meant relative to a staff"
+              " symbol.  These usually"
+              " have @code{Staff_symbol_referencer::callback} in their"
+              " @code{Y-offset-callbacks}.",
 
+              /* properties */
+              "staff-position "
+              );