X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=29a46e6d8aec7ed2c4e2ca1186551954b49ef90f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;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..29a46e6d8a 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
-  
+/*
+  staff-sym-referencer.hh -- declare staff_symbol_referencer
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef STAFF_SYM_REFERENCER_HH
-#define STAFF_SYM_REFERENCER_HH
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#ifndef STAFF_SYMBOL_REFERENCER_HH
+#define STAFF_SYMBOL_REFERENCER_HH
 
-#include "score-element.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 /**
    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*);
+  DECLARE_GROB_INTERFACE();
+  static bool ugly_hack (Grob *);
+  static void set_position (Grob *, Real);
+  DECLARE_SCHEME_CALLBACK (callback, (SCM element));
+
   /**
      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 line_thickness (Grob *);
+  static Real staff_space (Grob *);
+  static Grob *get_staff_symbol (Grob *);
+  static bool on_line (Grob *, int);
+  static bool on_staff_line (Grob *, int);
+  static int line_count (Grob *);
+  static Real get_position (Grob *);
+  static Real staff_radius (Grob *);
+  static int get_rounded_position (Grob *);
+  static Interval extent_in_staff (Grob *); 
 };
 
-#endif /* STAFF_SYM_REFERENCER_HH */
+int compare_position (Grob *const &, Grob *const &);\
+bool position_less (Grob *const &, Grob *const &);
+#endif /* STAFF_SYMBOL_REFERENCER_HH */