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

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 9ccb4d65b3..7ebedb4d46 100644
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -1,43 +1,46 @@
 /*
-  span-bar.hh -- declare Span_bar
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 (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);
+
+  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 (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