X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=312db5c9cca41f4e98b7f31868c446c9c6b6cec3;hb=ca3b8c69a4a3d6bf69fcf7e36b32e0175bb7ff18;hp=6b5ec9e8c38844d5d40bf63d1c0d8227e2d3cde3;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 6b5ec9e8c3..312db5c9cc 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,46 +1,57 @@
-/* 
- 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>
- 
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef STAFF_SYMBOL_REFERENCER_HH
 #define STAFF_SYMBOL_REFERENCER_HH
 
-#include "grob.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 
+   A notation object that needs access to variables of the staff (no
+   lines, leading).
+*/
+class Staff_symbol_referencer
 {
 public:
-  static bool has_interface (Grob*);
-  static bool ugly_hack (Grob*);  
-  static void set_position (Grob*, Real);
-  DECLARE_SCHEME_CALLBACK (callback, (SCM element, SCM axis));
+  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.
   */
-  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*);
+  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 *); 
 };
 
-int compare_position (Grob *const&, Grob *const&); 
+int compare_position (Grob *const &, Grob *const &);\
+bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */