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 93213fa0b26b9b2cac75330078689e283cacbbf3..880eb0dba009dfcb02f65563c6a81bc1fe1441dd 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -10,34 +10,27 @@
 #ifndef SPAN_BAR_HH
 #define SPAN_BAR_HH
 
-#include "bar.hh"
+#include "lily-guile.hh"
+#include "lily-proto.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 Bar
+class Span_bar
 {
-  Interval get_spanned_interval () const;
 public:
-  Span_bar();
-    
-  VIRTUAL_COPY_CONS(Score_element);
-  void add_bar (Score_element*);
-protected:
-  void evaluate_empty ();
-
-  static Interval width_callback(Dimension_cache const*) ;
-  static Interval height_callback(Dimension_cache const*) ;  
-  
-  virtual Real get_bar_size () const;
-  virtual void before_line_breaking ();
-  virtual void after_line_breaking ();
+  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*);
+  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