X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=531497d98890cc10370f226f4e4558502f7f9c54;hb=cf33d3709d3b5028fa9c208aa490ce066960ad5c;hp=2dc8ae8c00d3ff5f1d3b75e4612888d29befe4aa;hpb=82731e802565546441c401a84a13b486e54eb760;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 2dc8ae8c00..531497d988 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,45 +1,46 @@
-/*   
-  staff-sym-referencer.hh -- declare Staff_sym_referencer
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 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_SYM_REFERENCER_HH
-#define STAFF_SYM_REFERENCER_HH
+#ifndef STAFF_SYMBOL_REFERENCER_HH
+#define STAFF_SYMBOL_REFERENCER_HH
+
+#include "grob.hh"
 
-#include "score-element.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 : public virtual Score_element
+class Staff_symbol_referencer 
 {
-  int position_i_;
-protected:
-  Staff_symbol * staff_sym_l_;
-
 public:
-  Staff_symbol_referencer ();
-  void set_position (int);
   
-  void set_staff_symbol (Staff_symbol*);
+  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_line_leading_f () const;
-  Staff_symbol * staff_symbol_l () const;
-  int lines_i () const;
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
-  virtual void do_pre_processing ();
-  virtual 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*);
 };
 
-#endif /* STAFF_SYM_REFERENCER_HH */
+int compare_position (Grob *const&,Grob *const&); 
+#endif /* STAFF_SYMBOL_REFERENCER_HH */