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

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index b13a68364f..08316b5f33 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -17,24 +17,21 @@
    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);
+  
+  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 (print, (SCM ));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
+  DECLARE_SCHEME_CALLBACK (center_on_spanned_callback, (SCM element, SCM axis));
 };
 
 #endif // SPAN_BAR_HH