Merge with master

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

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index af6d394ead586b0d438f8dabb581f11ec81788b9..b4241f2800b323363efc57cd57cc7d0a44b8dae4 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFF_SPACING_HH
@@ -15,8 +15,8 @@
 class Staff_spacing
 {
 public:
-  static void next_notes_correction (Grob *, Grob *, Real *, Real *);
-  static void next_note_correction (Grob *, Grob *, Interval, Real*, Real *);
+  static void next_notes_correction (Grob *, Grob *, Real, Real, Real *, Real *);
+  static void next_note_correction (Grob *, Grob *, Interval, Real, Real, Real*, Real *, int *);
   DECLARE_GROB_INTERFACE();
   static void get_spacing_params (Grob *, Real *, Real *);