X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=d945de1492391326db8df3adcd0ff116937c81f3;hb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;hp=20311c8abb53fcd4f280b5a360e6d9d845fd7be0;hpb=736088f09a0b77acc84f6e1a54cddb8bad3d94c1;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 20311c8abb..d945de1492 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,48 +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--2003 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 (Score_element const*, Axis a);
+  
+  static bool has_interface (Grob*);
+  static bool ugly_hack (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 * 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*);
 };
 
-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 */