X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=ed6156c62c78b1a1acae8423c1906d6e10cf8226;hb=94ecf2d9c75797163920353c5199d02c43e0a4e6;hp=2502f50baab2ac019f3f20fa1030503bdb326817;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 2502f50baa..ed6156c62c 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,15 +1,27 @@
 /*
-  staff-sym-referencer.hh -- declare staff_symbol_referencer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
@@ -18,10 +30,10 @@
 class Staff_symbol_referencer
 {
 public:
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static bool ugly_hack (Grob *);
   static void set_position (Grob *, Real);
-  DECLARE_SCHEME_CALLBACK (callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (callback, (SCM element));
 
   /**
      Leading are the lead strips between the sticks (lines) of
@@ -30,14 +42,16 @@ public:
   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 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 &);
+bool position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */