X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=434ff92d80828f5e6b95bbd31ac430f9bb12a26e;hb=e434a44b5d693cba78b5debb929a76da4c744981;hp=9b5b74e0e977481b656faebeb9b51c8e60f5cd4a;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 9b5b74e0e9..434ff92d80 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,46 +1,46 @@
-/* 
- staff-sym-referencer.hh -- declare staff_symbol_referencer
- 
- source file of the GNU LilyPond music typesetter
- 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- 
- */
+/*
+  staff-sym-referencer.hh -- declare staff_symbol_referencer
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
 #define STAFF_SYMBOL_REFERENCER_HH
 
-#include "grob.hh"
-
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 /**
- A notation object that needs access to variables of the staff (no
- lines, leading).
- 
- */
-class Staff_symbol_referencer 
+   A notation object that needs access to variables of the staff (no
+   lines, leading).
+*/
+class Staff_symbol_referencer
 {
 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_GROB_INTERFACE();
+  static bool ugly_hack (Grob *);
+  static void set_position (Grob *, Real);
+  DECLARE_SCHEME_CALLBACK (callback, (SCM element));
 
   /**
      Leading are the lead strips between the sticks (lines) of
      typeface. ie. leading is vertical space.
   */
-  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 int line_count (Grob*);
-  static Real get_position (Grob*);
-  static Real staff_radius (Grob*);
-  static int get_rounded_position (Grob*);
+  static Real line_thickness (Grob *);
+  static Real staff_space (Grob *);
+  static Grob *get_staff_symbol (Grob *);
+  static bool on_line (Grob *, int);
+  static bool on_staff_line (Grob *, int);
+  static int line_count (Grob *);
+  static Real get_position (Grob *);
+  static Real staff_radius (Grob *);
+  static int get_rounded_position (Grob *);
+  static Interval extent_in_staff (Grob *); 
 };
 
-int compare_position (Grob *const&,Grob *const&); 
+int compare_position (Grob *const &, Grob *const &);\
+bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */