Add skyline-based collision resolving for grobs above and below the staff

[lilypond.git] / lily / grob-interface.cc

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 3ea894b2f6623e487e07d422fd046bdf69baa084..9d52d4a56a435f40b0eaacdfa643d00e27b6a872 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -3,18 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-interface.hh"
 
-#include "protected-scm.hh"
 #include "grob.hh"
+#include "international.hh"
+#include "protected-scm.hh"
+#include "std-string.hh"
 #include "warn.hh"
 
-void add_interface (const char *symbol,
-                   const char *descr,
-                   const char *vars)
+void add_interface (char const *symbol,
+                   char const *descr,
+                   char const *vars)
 {
   SCM s = ly_symbol2scm (symbol);
   SCM d = scm_makfrom0str (descr);
@@ -34,7 +36,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
       return;
     }
 
-  SCM ifs = me->interfaces_;
+  SCM ifs = me->interfaces ();
 
   SCM all_ifaces = ly_all_grob_interfaces ();
   bool found = false;
@@ -43,8 +45,8 @@ check_interfaces_for_property (Grob const *me, SCM sym)
       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 (scm_car (ifs)).to_str0 ()));
+         string msg = to_string (_f ("Unknown interface `%s'",
+                                     ly_symbol2string (scm_car (ifs)).c_str ()));
          programming_error (msg);
          continue;
        }
@@ -54,9 +56,9 @@ check_interfaces_for_property (Grob const *me, SCM sym)
 
   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);
     }
 }