2003 -> 2004

[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 129848172bbeddab67f690890c38e69b75e58b9e..b944ae93f7cbe496ac43415aa10d02aaea9c083b 100644 (file)
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -3,14 +3,14 @@
  
  source file of the GNU LilyPond music typesetter
  
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  
  */
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
 #define STAFF_SYMBOL_REFERENCER_HH
 
-#include "score-element.hh"
+#include "grob.hh"
 
 
 /**
@@ -21,25 +21,27 @@
 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);
+  
+  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.
   */
  
-  static Real staff_space (Score_element*);
-  static Score_element * staff_symbol_l (Score_element*);
-  static bool on_staffline (Score_element*);
-  static bool on_staffline (Score_element*,int);
-  static int line_count (Score_element*);
-  static Real position_f (Score_element*);
-  static Real staff_radius (Score_element*);
+  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*);
 };
 
-int compare_position (Score_element *const&,Score_element *const&); 
+int compare_position (Grob *const&,Grob *const&); 
 #endif /* STAFF_SYMBOL_REFERENCER_HH */