Merge branch 'master' into dev/texi2html

[lilypond.git] / lily / include / cluster.hh

diff --git a/lily/include/cluster.hh b/lily/include/cluster.hh
index 2895a00ae93d9b3a31a516bf4c9b9a447625cf38..e15d0024145bf4fbab53b253e4c41bc70554fdf7 100644 (file)
--- a/lily/include/cluster.hh
+++ b/lily/include/cluster.hh
@@ -3,21 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef CLUSTER_HH
 #define CLUSTER_HH
 
 #include "stencil.hh"
+#include "grob-interface.hh"
 
 class Cluster
 {
 public:
-  DECLARE_SCHEME_CALLBACK (print, (SCM ));
-  //  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  static bool has_interface (Grob *);
-  // DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif // CLUSTER_HH