Run `make grand-replace'.

[lilypond.git] / lily / include / staff-spacing.hh

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 8359dcd53cb44fcf334cfccb974ce5dfa99b1284..4e02adc73d5ecd2a6432a5ec49028b650e728d81 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -1,27 +1,27 @@
-/*   
-staff-spacing.hh -- declare Staff_spacing
+/*
+  staff-spacing.hh -- declare Staff_spacing
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c)  2001--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef STAFF_SPACING_HH
 #define STAFF_SPACING_HH
 
 #include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "spring.hh"
 
 class Staff_spacing
 {
-public:
-  static Real next_notes_correction (Grob*, Grob*);
-  static Real next_note_correction (Grob*, Grob*, Interval);  
-  static bool has_interface (Grob*);
-  static void get_spacing_params (Grob*,Real*,Real*);
+  static Real optical_correction (Grob *, Grob *, Interval);
+  static Real next_notes_correction (Grob *, Grob *);
 
-  static Interval bar_y_positions (Grob*);
-  static  Grob*  extremal_break_aligned_grob (Grob*,Direction, Interval*);
+public:
+  DECLARE_GROB_INTERFACE();
+  static Spring get_spacing (Grob *, Grob *right_col);
+  static Interval bar_y_positions (Grob *);
 };
 
 #endif /* STAFF_SPACING_HH */