* lily/grob.cc: remove X-extent-callback / Y-extent-callback.

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

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 16fb8be22190dec226f100f017361d2e8101ab98..7a21e66111a5d4285428480fe70806426c17ec10 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -3,7 +3,6 @@
 */
 
 #include <cstring>
-#include <math.h>
 
 #include "main.hh"
 #include "input-smob.hh"
@@ -27,6 +26,12 @@ Grob::get_property_alist_chain (SCM def) const
                     SCM_UNDEFINED);
 }
 
+SCM
+Grob::get_interfaces () const
+{
+  return interfaces_;
+}
+
 /*
   This special add_thing routine is slightly more efficient than
 
@@ -42,9 +47,7 @@ Grob::add_to_list_property (SCM sym, SCM thing)
     = scm_sloppy_assq (sym, mutable_property_alist_);
 
   if (handle != SCM_BOOL_F)
-    {
-      scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
-    }
+    scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
   else
     {
       /*
@@ -60,8 +63,6 @@ Grob::add_to_list_property (SCM sym, SCM thing)
     }
 }
 
-
-
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
 
 void
@@ -71,12 +72,12 @@ Grob::internal_set_property (SCM sym, SCM v)
   SCM grob_p = ly_lily_module_constant ("ly:grob?");
   SCM grob_list_p = ly_lily_module_constant ("grob-list?");
   SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
-  
+
   if (type == grob_p
       || type == grob_list_p
       || (unsmob_grob (v) && ly_symbol2scm ("cause") != sym))
     {
-      scm_display (scm_list_2 (sym, type), scm_current_output_port());
+      scm_display (scm_list_2 (sym, type), scm_current_output_port ());
       assert (0);
     }
 #endif
@@ -97,38 +98,92 @@ Grob::internal_set_property (SCM sym, SCM v)
 
 //#define PROFILE_PROPERTY_ACCESSES
 
+/*
+  Ugh C&P Coding.
 
-
-
+  Retrieve property without triggering callback.
+ */
 SCM
-Grob::internal_get_property (SCM sym) const
+Grob::get_property_data (SCM sym) const
 {
 #ifndef NDEBUG
   if (profile_property_accesses)
-    {
-      note_property_access (&grob_property_lookup_table, sym);
-    }
+    note_property_access (&grob_property_lookup_table, sym);
 #endif
   
-  SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
-  if (s != SCM_BOOL_F)
-    return scm_cdr (s);
-  
-  s = scm_sloppy_assq (sym, immutable_property_alist_);
+  SCM handle = scm_sloppy_assq (sym, mutable_property_alist_);
+  if (handle != SCM_BOOL_F)
+    return scm_cdr (handle);
+
+  handle = scm_sloppy_assq (sym, immutable_property_alist_);
 
-  if (do_internal_type_checking_global && scm_is_pair (s))
+  if (do_internal_type_checking_global && scm_is_pair (handle))
     {
-      if (!type_check_assignment (sym, scm_cdr (s),
+      if (!type_check_assignment (sym, scm_cdr (handle),
                                  ly_symbol2scm ("backend-type?")))
        abort ();
 
       check_interfaces_for_property (this, sym);
     }
+  
+  return (handle == SCM_BOOL_F) ? SCM_EOL : scm_cdr (handle);
+}
 
-  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
+SCM
+Grob::internal_get_property (SCM sym) const
+{
+  SCM val = get_property_data (sym);
+  if (ly_is_procedure (val))
+    {
+      val = ((Grob*)this)->try_callback (sym, val);
+    }
+  
+  return val;
 }
 
+#ifndef NDEBUG
+#include "protected-scm.hh"
+Protected_scm grob_property_callback_stack = SCM_EOL;
+bool debug_property_callbacks = 1;
+#endif
 
+SCM
+Grob::try_callback (SCM sym, SCM proc)
+{      
+  SCM marker = ly_symbol2scm ("calculation-in-progress");
+  /*
+    need to put a value in SYM to ensure that we don't get a
+    cyclic call chain.
+  */
+  mutable_property_alist_
+    = scm_assq_set_x (mutable_property_alist_, sym, marker);
+
+#ifndef NDEBUG
+  if (debug_property_callbacks)
+    grob_property_callback_stack = scm_acons (sym, proc, grob_property_callback_stack);
+#endif
+  SCM value = scm_call_1 (proc, self_scm ());
+#ifndef NDEBUG
+  if (debug_property_callbacks)
+    grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
+#endif
+         
+  /*
+    If the function returns SCM_UNSPECIFIED, we assume the
+    property has been set with an explicit set_property()
+    call.
+  */
+  if (value == SCM_UNSPECIFIED)
+    {
+      value = internal_get_property (sym);
+      if (value == marker)
+       mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, marker);
+    }
+  else
+    internal_set_property (sym, value);
+         
+  return value;
+}
 
 void
 Grob::internal_set_object (SCM s, SCM v)
@@ -140,6 +195,12 @@ Grob::internal_set_object (SCM s, SCM v)
   object_alist_ = scm_assq_set_x (object_alist_, s, v);
 }
 
+void
+Grob::del_property (SCM sym)
+{
+  mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, sym);
+}
+
 SCM
 Grob::internal_get_object (SCM sym) const
 {