X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fspan-bar.hh;h=449f8bca3d91ec0d54e5c9f4587c2143e32445e1;hb=883e317d51c5e50011bc0e764a785631e5ea8689;hp=aa461fe1c49ae8a580b7a92fc916afd177859260;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index aa461fe1c4..449f8bca3d 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,36 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef SPAN_BAR_HH
 #define SPAN_BAR_HH
 
-#include "bar.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
-class Span_bar : public Bar
+/**
+   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.
+*/
+class Span_bar
 {
-  Link_array<Score_element> spanning_l_arr_;
-  Interval get_spanned_interval () const;
 public:
-  Real extra_x_off_;
-  bool no_width_b_;
-  Span_bar();
-    
-  VIRTUAL_COPY_CONS(Score_element);
-  void add_bar (Bar*);
-  void set_align (Align_element *);
 
-protected:
-  void evaluate_empty ();
-  virtual Interval do_width() const;
-  virtual void do_pre_processing();
-  virtual void do_post_processing();
-  virtual Interval do_height () const;
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
-  virtual Molecule * do_brew_molecule_p() const;
+  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