X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-interface.cc;h=b353205d84d3e26ab9092c1a799544c76b310848;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=aaa22f5fb5681fbe347fd3ff6a407384d57800d2;hpb=1d1f85702652995fe2531ed26a2db8756fb3b4ee;p=lilypond.git

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index aaa22f5fb5..b353205d84 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -1,89 +1,84 @@
 /*
-  grob-interface.cc -- implement graphic objects 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--2004 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/>.
 */
 
-#include "protected-scm.hh"
 #include "grob-interface.hh"
-#include "lily-guile.hh"
+
 #include "grob.hh"
+#include "international.hh"
+#include "protected-scm.hh"
+#include "string-convert.hh"
 #include "warn.hh"
+#include "misc.hh"
 
-Protected_scm all_ifaces;
-
-void add_interface (const char * symbol,
-		    const char * descr,
-		    const char * vars)
+SCM add_interface (char const *cxx_name,
+                   char const *descr,
+                   char const *vars)
 {
-  SCM s = ly_symbol2scm (symbol);
-  SCM d = scm_makfrom0str (descr);
+  string suffix ("-interface");
+  string lispy_name = camel_case_to_lisp_identifier (cxx_name);
+  vsize end = max (int (0), int (lispy_name.length () - suffix.length ()));
+  if (lispy_name.substr (end) != suffix)
+    lispy_name += suffix;
+
+  SCM s = ly_symbol2scm (lispy_name.c_str ());
+  SCM d = scm_from_locale_string (descr);
   SCM l = parse_symbol_list (vars);
 
-  ly_add_interface (s,d,l);
-}
-
-
-LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c),
-	  "Add an interface description.")
-{
-  SCM_ASSERT_TYPE (ly_c_symbol_p (a), a, SCM_ARG1, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string");  
-  SCM_ASSERT_TYPE (ly_c_list_p (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
-  if (!ly_c_vector_p (all_ifaces))
-    all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL);
-
-  SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);
-
-  scm_hashq_set_x (all_ifaces, a, entry);
-
-  return SCM_UNSPECIFIED;
-}
-
+  internal_add_interface (s, d, l);
 
-LY_DEFINE (ly_all_grob_interfaces, "ly:all-grob-interfaces",
-	  0,0,0, (),
-	  "Get a hash table with all interface descriptions.")
-{
-  return all_ifaces;
+  return s;
 }
 
-
 void
 check_interfaces_for_property (Grob const *me, SCM sym)
 {
   if (sym == ly_symbol2scm ("meta"))
     {
       /*
-	otherwise we get in a nasty recursion loop.
-       */
-      return ;
-
+        otherwise we get in a nasty recursion loop.
+      */
+      return;
     }
-  SCM ifs = me->get_property ("interfaces");
 
+  SCM ifs = me->interfaces ();
+
+  SCM all_ifaces = ly_all_grob_interfaces ();
   bool found = false;
-  for (; !found && ly_c_pair_p (ifs); ifs =ly_cdr (ifs))
+  for (; !found && scm_is_pair (ifs); ifs = scm_cdr (ifs))
     {
-      SCM iface = scm_hashq_ref (all_ifaces , ly_car (ifs), SCM_BOOL_F);
+      SCM iface = scm_hashq_ref (all_ifaces, scm_car (ifs), SCM_BOOL_F);
       if (iface == SCM_BOOL_F)
-	{
-	  String msg = to_string (_f ("Unknown interface `%s'",
-				      ly_symbol2string (ly_car (ifs)).to_str0 ()));
-	  programming_error (msg);
-	  continue;
-	}
-
-      found= found || (scm_c_memq (sym, ly_caddr (iface)) != SCM_BOOL_F);
+        {
+          string msg = to_string (_f ("Unknown interface `%s'",
+                                      ly_symbol2string (scm_car (ifs)).c_str ()));
+          programming_error (msg);
+          continue;
+        }
+
+      found = found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
     }
 
   if (!found)
     {
-      String str = to_string (_f ("Grob `%s' has no interface for property `%s'",
-				  me->name ().to_str0 (),
-				  ly_symbol2string (sym).to_str0 ()));
+      string str = to_string (_f ("Grob `%s' has no interface for property `%s'",
+                                  me->name ().c_str (),
+                                  ly_symbol2string (sym).c_str ()));
       programming_error (str);
     }
 }