X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=a6cd7960d1e02a7271efbd8c84d5634caa4dfb4b;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=9ccb4d65b37e571d17cce28aee606001240e1f89;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 9ccb4d65b3..a6cd7960d1 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,41 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #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 (SCM);
-    
-  VIRTUAL_COPY_CONS(Score_element);
-  void add_bar (Score_element*);
-  void evaluate_empty ();
-
-  static Interval width_callback(Score_element const*, Axis) ;
-  
-  virtual Real get_bar_size () const;
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
+  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 (brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
+  DECLARE_SCHEME_CALLBACK (center_on_spanned_callback, (SCM element, SCM axis));
 };
 
 #endif // SPAN_BAR_HH