Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

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

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 1c4150a2508f2adbedb4859e0045bf581f6e044f..9b3010facd31c74b11229d10b21d9811c4c8714c 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -1,11 +1,10 @@
-/*   
-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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef STAFF_SPACING_HH
 #define STAFF_SPACING_HH
@@ -15,13 +14,12 @@ source file of the GNU LilyPond music typesetter
 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 void next_notes_correction (Grob *, Grob *, Real *, Real *);
+  static void next_note_correction (Grob *, Grob *, Interval, Real*, Real *);
+  static bool has_interface (Grob *);
+  static void get_spacing_params (Grob *, Real *, Real *);
 
-  static Interval bar_y_positions (Grob*);
-  static  Grob*  extremal_break_aligned_grob (Grob*,Direction, Interval*);
+  static Interval bar_y_positions (Grob *);
 };
 
 #endif /* STAFF_SPACING_HH */