Merge with master

[lilypond.git] / lily / include / script-interface.hh

diff --git a/lily/include/script-interface.hh b/lily/include/script-interface.hh
index 8d0e0355c01574310f95325f113160438592732c..39e0388331705c2bd550f9a033b9ab9099ef0496 100644 (file)
--- a/lily/include/script-interface.hh
+++ b/lily/include/script-interface.hh
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCRIPT_INTERFACE_HH
 #define SCRIPT_INTERFACE_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
    Articulation marks (and the like) that are attached to notes/stems.
@@ -21,7 +21,7 @@ class Script_interface
 {
 public:
   static Stencil get_stencil (Grob *, Direction d);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
 };