X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=6b5ec9e8c38844d5d40bf63d1c0d8227e2d3cde3;hb=29c0474da054e124937aa219dbb07a0f164d6a45;hp=255c57abcca1f1c9227a41013bc5046c6826c135;hpb=1a71119277d04b287b3a976c526adba6500239c6;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 255c57abcc..6b5ec9e8c3 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_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--2005 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 
 {
-protected:
-  Staff_symbol * staff_sym_l_;
-
 public:
-  Staff_symbol_referencer ();
-  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 Real position_f () const;
+  */
+  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*);
+  static int get_rounded_position (Grob*);
 };
 
-#endif /* STAFF_SYM_REFERENCER_HH */
+int compare_position (Grob *const&, Grob *const&); 
+#endif /* STAFF_SYMBOL_REFERENCER_HH */