Merge with master

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

diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh
index a3af5beedb1ba23f63d20c212dcc1922792d4882..3af69d63445c56ee6c861290786efc9e95463dc3 100644 (file)
--- a/lily/include/text-spanner.hh
+++ b/lily/include/text-spanner.hh
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-
 #ifndef TEXT_SPANNER_HH
 #define TEXT_SPANNER_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 class Text_spanner
 {
 public:
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
-  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* TEXT_SPANNER_HH */