Imported Upstream version 2.14.2

[lilypond.git] / lily / include / span-bar.hh

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index 56f4d2a0e5c4c47f98dabc09accce14176431280..7ebedb4d46238d0555f7b1906c4c8d4da35cdb44 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -1,17 +1,27 @@
 /*
-  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--2002 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 "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
    This is a barline that is spanned across other bar lines.  This is
@@ -21,17 +31,16 @@
 class Span_bar
 {
 public:
-  
-  static bool has_interface (Grob*);  
-  static Interval get_spanned_interval (Grob*);
-  static void add_bar (Grob*,Grob*);
-  static void evaluate_glyph (Grob*);
-  static void evaluate_empty (Grob*);
-  DECLARE_SCHEME_CALLBACK (width_callback, (SCM smob, SCM axis));
-  DECLARE_SCHEME_CALLBACK (get_bar_size, (SCM ));
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
-  DECLARE_SCHEME_CALLBACK (center_on_spanned_callback, (SCM element, SCM axis));
+
+  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