X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob-interface.hh;h=2062393f0b74910fe944c726a2b08625f8561499;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=b0fd15a176b13b79e68ecd182e60a1e53953007c;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/include/grob-interface.hh b/lily/include/grob-interface.hh
index b0fd15a176..2062393f0b 100644
--- a/lily/include/grob-interface.hh
+++ b/lily/include/grob-interface.hh
@@ -1,32 +1,49 @@
 /*
-  interface.hh -- declare Interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@xs4all.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 INTERFACE_HH
 #define INTERFACE_HH
 
-#include <libguile.h> /* SCM */
-
-#define ADD_INTERFACE(cl, a, b, c)				\
-  bool cl::has_interface (Grob *me)				\
-  {								\
-    return me->internal_has_interface (ly_symbol2scm (a));	\
-  }								\
-  void cl ## _init_ifaces ()					\
-  {								\
-    add_interface (a, b, c);					\
-  }								\
+#include "lily-guile.hh"
+
+#define DECLARE_GROB_INTERFACE() \
+  static SCM interface_symbol_;    \
+  static bool has_interface (Grob*)
+
+#define ADD_INTERFACE(cl, b, c)                         \
+  SCM cl::interface_symbol_; \
+  bool cl::has_interface (Grob *me)                             \
+  {                                                             \
+    return me->internal_has_interface (interface_symbol_);      \
+  }                                                             \
+  void cl ## _init_ifaces ()                                    \
+  {                                                             \
+    cl::interface_symbol_ = add_interface (#cl, b, c);          \
+  }                                                             \
   ADD_SCM_INIT_FUNC (cl ## ifaces, cl ## _init_ifaces);
 
-void add_interface (char const *symbol,
-		    char const *descr,
-		    char const *vars);
+SCM add_interface (char const *cxx_name,
+                   char const *descr,
+                   char const *vars);
 
 SCM ly_add_interface (SCM, SCM, SCM);
+void internal_add_interface (SCM, SCM, SCM);
 SCM ly_all_grob_interfaces ();
 
 #endif /* INTERFACE_HH */