Imported Upstream version 2.16.0

[lilypond.git] / lily / include / staff-symbol-referencer.hh

diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index ed6156c62c78b1a1acae8423c1906d6e10cf8226..79d07cfe7c91f9c6e1df1de0c5c75074f1784dbf 100644 (file)
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2012 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
@@ -30,9 +30,10 @@
 class Staff_symbol_referencer
 {
 public:
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
   static bool ugly_hack (Grob *);
   static void set_position (Grob *, Real);
+  static void pure_set_position (Grob *, Real);
   DECLARE_SCHEME_CALLBACK (callback, (SCM element));
 
   /**
@@ -46,12 +47,29 @@ public:
   static bool on_staff_line (Grob *, int);
   static int line_count (Grob *);
   static Real get_position (Grob *);
+  static Real pure_get_position (Grob *);
+
+  /**
+     Interval of staff lines.
+  */
+  static Interval staff_span (Grob *);
+
+  /**
+     Half of the height, in staff space, i.e. 2.0 for a normal staff.
+  */
   static Real staff_radius (Grob *);
+
   static int get_rounded_position (Grob *);
-  static Interval extent_in_staff (Grob *); 
+  static int pure_get_rounded_position (Grob *);
+  static Interval extent_in_staff (Grob *);
+
+private:
+  static void internal_set_position (Grob *, Real, bool);
+  static Real internal_get_position (Grob *, bool);
 };
 
 int compare_position (Grob *const &, Grob *const &);
 bool position_less (Grob *const &, Grob *const &);
+bool pure_position_less (Grob *const &, Grob *const &);
 #endif /* STAFF_SYMBOL_REFERENCER_HH */