Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / staff-symbol-referencer.hh

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 2502f50baab2ac019f3f20fa1030503bdb326817..5e1fd878fdd5128b3450321dabf0289d18d6e20b 100644 (file)
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
@@ -21,7 +21,7 @@ public:
   static bool has_interface (Grob *);
   static bool ugly_hack (Grob *);
   static void set_position (Grob *, Real);
-  DECLARE_SCHEME_CALLBACK (callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (callback, (SCM element));
 
   /**
      Leading are the lead strips between the sticks (lines) of
@@ -30,8 +30,10 @@ public:
   static Real line_thickness (Grob *);
   static Real staff_space (Grob *);
   static Grob *get_staff_symbol (Grob *);
-  static bool on_staffline (Grob *);
-  static bool on_staffline (Grob *, int);
+  static bool on_line (Grob *);
+  static bool on_line (Grob *, int);
+  static bool on_staff_line (Grob *, int);
+  static bool on_staff_line (Grob *);
   static int line_count (Grob *);
   static Real get_position (Grob *);
   static Real staff_radius (Grob *);