X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=780531ac1cdde429854227cfeff4c07518b303e6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b13a68364f2ad51cbdc8b178becee4cdb5b4c811;hpb=422004486569407b8809da7f3c7053c1e4767bff;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index b13a68364f..780531ac1c 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,38 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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
    the implementation of the long barlines that occur in orchestral
    score and other multi-staff music.
-
-   TODO: Is this usable for other stuff besides barlines? We only have
-   to span a Score_element.  Perhaps this can be used for large time
-   sigs?
 */
 class Span_bar
 {
 public:
-  static void set_interface (Score_element*);
-  static bool has_interface (Score_element*);  
-  static Interval get_spanned_interval (Score_element*);
-  static void add_bar (Score_element*,Score_element*);
-  static void evaluate_glyph (Score_element*);
-  static void evaluate_empty (Score_element*);
-  static Interval width_callback(Score_element *, Axis) ;
-  static SCM get_bar_size (SCM);
-  static SCM before_line_breaking (SCM);
-  static Real center_on_spanned_callback (Score_element*,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