X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=434ff92d80828f5e6b95bbd31ac430f9bb12a26e;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=60e9ac27870c78a2a4d71bacf40d27b04c8911b7;hpb=163503e56aa0c03d41d37fd083bdb96a6a473a11;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 60e9ac2787..434ff92d80 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_symbol_referencer
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2009 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_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 (Dimension_cache const*); 
+  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;
-  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 *); 
 };
 
-
-Staff_symbol_referencer_interface staff_symbol_referencer_interface  (Score_element const*);
-
+int compare_position (Grob *const &, Grob *const &);\
+bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */