* scm/define-grobs.scm (all-grob-descriptions): put ledger lines

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 578b1151dd3e15ee53f232c00fb6a986a5ffb3e0..a54a526a7701e5fbd73c1f4729737cf9921bc9c1 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,10 +19,11 @@
 class Rest_collision
 {
 public:
-  static void add_column (Grob*me,Grob*);
-  static void set_interface (Grob*me);
+  static void add_column (Grob*me, Grob*);
+  
   static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis));
-  static SCM do_shift (Grob*,SCM);
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM axis));
+  static SCM do_shift (Grob*);
 };
 #endif // REST_COLLISION_HH