Run `make grand-replace'.

[lilypond.git] / lily / include / dot-column.hh

diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index 994d89c0c2b380717f35739700ca0fcd067242ca..0d94b9359483b0d25e3eb6669cf45ff03a5d18a2 100644 (file)
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -3,29 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef DOT_COLUMN_HH
 #define DOT_COLUMN_HH
 
-#include "lily-guile.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
+
 
 class Grob;
 
 /**
-  Group dots.  This is needed because, the dots have to be aligned per voice
- */
-class Dot_column               // interface
+   Group dots.  This is needed because, the dots have to be aligned per voice
+*/
+class Dot_column // interface
 {
 public:
-  static int compare (Grob * const&,Grob * const&);
-  static void add_head (Grob * dotcol, Grob* rh );
+  static int compare (Grob *const &, Grob *const &);
+  static void add_head (Grob *dotcol, Grob *rh);
 
-  static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM ,SCM));
-  DECLARE_SCHEME_CALLBACK (side_position, (SCM ,SCM));  
-  static SCM do_shifts (Grob*);
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (side_position, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
 };
 #endif // DOT_COLUMN_HH