release: 1.5.13

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

diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index e812875e99da32328b45a0b9064f39c88e173fd6..65eb4c5a7559f19b3daa4bf3e8a73f0629dceb72 100644 (file)
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -3,28 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef DOT_COLUMN_HH
 #define DOT_COLUMN_HH
 
-#include "item.hh"
-
+#include "lily-guile.hh"
 
 /**
   Group dots.  This is needed because, the dots have to be aligned per voice
  */
-class Dot_column : public Item
+class Dot_column               // interface
 {
-  static int compare (Score_element * const&,Score_element * const&);
 public:
-  VIRTUAL_COPY_CONS (Score_element);
-  void add_head (Rhythmic_head*);
-  Dot_column (SCM);
-  
-  static Real force_shift_callback (Score_element const* , Axis);
+  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 (SCM dotlist);
 };
 #endif // DOT_COLUMN_HH