X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=d06b514afc7869b3ea66d5c8de7c4bf4d43b09f7;hb=05286945fcf2083341d94fd18cf66393183ef276;hp=1e7ea7eadd05d61ba30d097f8456d05e550467d5;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 1e7ea7eadd..d06b514afc 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,15 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef SPAN_BAR_HH
 #define SPAN_BAR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
    This is a barline that is spanned across other bar lines.  This is
@@ -21,16 +20,17 @@
 class Span_bar
 {
 public:
-  static void set_interface (Grob*);
-  static bool has_interface (Grob*);  
-  static Interval get_spanned_interval (Grob*);
-  static void add_bar (Grob*,Grob*);
-  static void evaluate_glyph (Grob*);
-  static void evaluate_empty (Grob*);
-  DECLARE_SCHEME_CALLBACK (width_callback, (SCM smob, SCM axis));
-  DECLARE_SCHEME_CALLBACK (get_bar_size, (SCM ));
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
-  DECLARE_SCHEME_CALLBACK (center_on_spanned_callback, (SCM element, SCM axis));
+
+  DECLARE_GROB_INTERFACE();
+  static Interval get_spanned_interval (Grob *);
+  static void add_bar (Grob *, Grob *);
+  static void evaluate_glyph (Grob *);
+  DECLARE_SCHEME_CALLBACK (width, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (calc_bar_size, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_glyph_name, (SCM));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (center_on_spanned_callback, (SCM element));
 };
 
 #endif // SPAN_BAR_HH