X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=51fe44fc466fdd3a26280b294e6823c28119be77;hb=941e0f90de763f5e61524a2f51b6b1ab3abcb80f;hp=ea46d2d474ed68af374d815d09ccd95663a2a41e;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index ea46d2d474..51fe44fc46 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,42 +1,46 @@
-/* 
- staff-sym-referencer.hh -- declare staff_symbol_referencer
- 
- source file of the GNU LilyPond music typesetter
- 
- (c) 1999--2000 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
 #define STAFF_SYMBOL_REFERENCER_HH
 
-#include "score-element.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 void set_interface (Score_element*);
-  static bool has_interface (Score_element*);
-  static void set_position (Score_element*,Real);
-  static Real callback (Score_element *, Axis a);
+  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 staff_space (Score_element*);
-  static Score_element * staff_symbol_l (Score_element*);
-  static int line_count (Score_element*);
-  static Real position_f (Score_element*);
+  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 (Score_element *const&,Score_element *const&); 
+int compare_position (Grob *const &, Grob *const &);\
+bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */