X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=d06b514afc7869b3ea66d5c8de7c4bf4d43b09f7;hb=92782fde87fb68e945b9eb60cacab6c01d0397df;hp=177ada65c406a1f144c784e48636dad410f96200;hpb=d3190e49a8f73d44b2e11034323b8f3592f288d6;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 177ada65c4..d06b514afc 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,26 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2009 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<Bar> spanning_l_arr_;
-
 public:
-    NAME_MEMBERS();
-    SCORE_ELEM_CLONE(Span_bar);
-    void add(Bar* );
-    void set( Vertical_align_element *);
-    void do_pre_processing();
-    void do_substitute_dependency(Score_elem*,Score_elem*);
-    Molecule * 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