X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=aa4affa2ce7de8cc57781c157854318ea81af376;hb=refs%2Ftags%2Frelease%2F1.5.45;hp=edd3263978b2610ce1eb83c0702149d8c970d6b9;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index edd3263978..aa4affa2ce 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,48 +1,45 @@
-/*   
-  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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ 
  */
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
 #define STAFF_SYMBOL_REFERENCER_HH
 
-#include "score-element.hh"
+#include "grob.hh"
 
 
 /**
-   A notation object that needs access to variables of the staff (no
-   lines, leading).
-   
+ A notation object that needs access to variables of the staff (no
+ lines, leading).
+ 
  */
-class Staff_symbol_referencer_interface 
+class Staff_symbol_referencer 
 {
 public:
-  Score_element * elt_l_;
-  Staff_symbol_referencer_interface (Score_element const*);
-  void set_interface ();
-  bool has_interface_b ();
-  void set_position (Real);
-  static Real callback (Dimension_cache const*); 
+  static void set_interface (Grob*);
+  static bool has_interface (Grob*);
+  static void set_position (Grob*,Real);
+  DECLARE_SCHEME_CALLBACK (callback, (SCM element, SCM axis));
 
   /**
      Leading are the lead strips between the sticks (lines) of
      typeface. ie. leading is vertical space.
-   */
-  
-  Real staff_space () const;
-  Staff_symbol * staff_symbol_l () const;
-  int line_count () const;
-  Real position_f () const;
+  */
+ 
+  static Real staff_space (Grob*);
+  static Grob * staff_symbol_l (Grob*);
+  static bool on_staffline (Grob*);
+  static bool on_staffline (Grob*,int);
+  static int line_count (Grob*);
+  static Real position_f (Grob*);
+  static Real staff_radius (Grob*);
 };
 
-int compare_position (Score_element *const&,Score_element *const&); 
-
-
-Staff_symbol_referencer_interface staff_symbol_referencer  (Score_element const*);
-
+int compare_position (Grob *const&,Grob *const&); 
 #endif /* STAFF_SYMBOL_REFERENCER_HH */