* lily/spacing-spanner.cc (calc_common_shortest_duration): use

[lilypond.git] / lily / include / rest-collision.hh

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index a0897dff64b48bead63f87bdadd0035e528f7582..fe76e1b15c8d4c5d8d44d6967eac1e78f42a1a7c 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REST_COLLISION_HH
@@ -12,15 +12,15 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-
 class Rest_collision
 {
 public:
   static void add_column (Grob *me, Grob *);
 
   static bool has_interface (Grob *);
-  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
-  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM off));
   static SCM do_shift (Grob *);
 };
 #endif // REST_COLLISION_HH