Merge with master

[lilypond.git] / lily / include / line-spanner.hh

diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh
index 6bd7e630d91b556a9af4be20b38d15f17afa25d8..ceff6f6a999a51ce259f62aa9282498461516804 100644 (file)
--- a/lily/include/line-spanner.hh
+++ b/lily/include/line-spanner.hh
@@ -3,16 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LINE_SPANNER_HH
 #define LINE_SPANNER_HH
 
-#include "lily-guile.hh"
-
-class Grob;
-class Stencil;
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
 class Line_spanner
 {
@@ -20,7 +18,7 @@ public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
   static Stencil line_stencil (Grob *me, Offset f, Offset t);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 
 private:
   static Offset get_broken_offset (Grob *me, Direction dir);