patch::: 1.3.96.jcn9

[lilypond.git] / lily / include / span-bar.hh

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index b13a68364f2ad51cbdc8b178becee4cdb5b4c811..880eb0dba009dfcb02f65563c6a81bc1fe1441dd 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -17,10 +17,6 @@
    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
 {
@@ -31,10 +27,10 @@ public:
   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_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));
 };
 
 #endif // SPAN_BAR_HH