X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=a328101ade112051e82749bf4a3a73fee1a177ac;hb=44ad1d66c072e4d6545e75c769c86a460cb1df13;hp=a66477ebe82d874eca1fff1795b83801c9c754f0;hpb=6ce61146edb1c36647b514778c29cdc9beedab6a;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index a66477ebe8..a328101ade 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,33 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef SPAN_BAR_HH
 #define SPAN_BAR_HH
 
-#include "bar.hh"
+#include "lily-guile.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 *);
 
-protected:
-    virtual Interval do_width()const;
-    virtual void do_pre_processing();
-    virtual void translate_y(Real y);
-    
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual Molecule * brew_molecule_p()const;
-    virtual Symbol get_bar_sym(Real dy) 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