* lily/stencil-expression.cc: idem.

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

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 38306c536b01fe84367e13b16c2545259f3d166c..8c68171fa92eaae76f688c8286c475f0384eb4f4 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -27,12 +27,6 @@ Grob::get_property_alist_chain (SCM def) const
                     SCM_UNDEFINED);
 }
 
-SCM
-Grob::get_interfaces () const
-{
-  return interfaces_;
-}
-
 
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
 
@@ -60,6 +54,7 @@ Grob::internal_set_property (SCM sym, SCM v)
   if (do_internal_type_checking_global)
     {
       if (!ly_is_procedure (v)
+         && !is_simple_closure (v)
          && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
        abort ();
       check_interfaces_for_property (this, sym);
@@ -87,6 +82,7 @@ Grob::get_property_data (SCM sym) const
     {
       SCM val = scm_cdr (handle);
       if (!ly_is_procedure (val)
+         && !is_simple_closure (val)
          && !type_check_assignment (sym, val, 
                                  ly_symbol2scm ("backend-type?")))
        abort ();
@@ -112,6 +108,7 @@ Grob::internal_get_property (SCM sym) const
 
 #ifndef NDEBUG
 #include "protected-scm.hh"
+
 Protected_scm grob_property_callback_stack = SCM_EOL;
 bool debug_property_callbacks = 0;
 #endif
@@ -190,15 +187,15 @@ Grob::internal_get_object (SCM sym) const
   return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
-void
-Grob::substitute_object_links (SCM crit, SCM orig)
+bool
+Grob::is_live () const
 {
-  set_break_subsititution (crit);
-  object_alist_ = substitute_object_alist (orig, object_alist_);
+  return immutable_property_alist_ != SCM_EOL;
 }
 
+
 bool
-Grob::is_live () const
+Grob::internal_has_interface (SCM k)
 {
-  return immutable_property_alist_ != SCM_EOL;
+  return scm_c_memq (k, interfaces_) != SCM_BOOL_F;
 }