X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspan-bar.hh;h=780531ac1cdde429854227cfeff4c07518b303e6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8100bbafedec5078ca1dc7c92f2da88e1da6c3ce;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 8100bbafed..780531ac1c 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,42 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
 
 /**
    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*);
-  void set_align (Align_element *);
-protected:
-  void evaluate_empty ();
 
-  static Interval width_callback(Dimension_cache const*) ;
-  static Interval height_callback(Dimension_cache const*) ;  
-  
-  virtual void do_pre_processing();
-  virtual void do_post_processing();
-  virtual Molecule do_brew_molecule() 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