X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=f1242994d53fb696133cbedfc6e6b2bc1b9336ce;hb=e1679a36d8dcf7535bd5e91b9fae3609bf37a0b6;hp=59a3cd68f2a2e79cf6ad3701a84320646c1812e7;hpb=8f8b3fb62d5d0776335de899b32aada69457810a;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 59a3cd68f2..f1242994d5 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -5,18 +5,41 @@
 #include <cstring>
 
 #include "main.hh"
-#include "input-smob.hh"
+#include "input.hh"
 #include "pointer-group-interface.hh"
 #include "misc.hh"
 #include "paper-score.hh"
 #include "output-def.hh"
 #include "spanner.hh"
+#include "international.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "item.hh"
 #include "program-option.hh"
 #include "profile.hh"
 #include "simple-closure.hh"
+#include "warn.hh"
+
+#ifndef NDEBUG
+static SCM modification_callback = SCM_EOL;
+
+LY_DEFINE (ly_set_grob_modification_callback, "ly:set-grob-modification-callback",
+	   1, 0, 0, (SCM cb),
+	   "Specify a procedure that will be called every time lilypond modifies "
+	   "a grob property. The callback will receive as arguments "
+	   "the grob that is being modified, the name of the C++ file in which "
+	   "the modification was requested, the line number in the C++ file in "
+	   "which the modification was requested, the property to be changed and "
+	   "the new value for the property.")
+{
+
+  SCM_ASSERT_TYPE(ly_is_procedure (cb), cb, SCM_ARG1, __FUNCTION__,
+		  "procedure");
+
+  modification_callback = cb;
+  return SCM_UNSPECIFIED;
+}
+#endif
 
 SCM
 Grob::get_property_alist_chain (SCM def) const
@@ -31,9 +54,9 @@ Grob::get_property_alist_chain (SCM def) const
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
 
 void
-Grob::internal_set_property (SCM sym, SCM v)
-{
 #ifndef NDEBUG
+Grob::internal_set_property (SCM sym, SCM v, char const *file, int line, char const *fun)
+{
   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?"));
@@ -45,6 +68,9 @@ Grob::internal_set_property (SCM sym, SCM v)
       scm_display (scm_list_2 (sym, type), scm_current_output_port ());
       assert (0);
     }
+#else
+Grob::internal_set_property (SCM sym, SCM v)
+{
 #endif
 
   /* Perhaps we simply do the assq_set, but what the heck. */
@@ -55,17 +81,28 @@ Grob::internal_set_property (SCM sym, SCM v)
     {
       if (!ly_is_procedure (v)
 	  && !is_simple_closure (v)
+	  && v != ly_symbol2scm ("calculation-in-progress") 
 	  && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
 	abort ();
       check_interfaces_for_property (this, sym);
     }
 
+#ifndef NDEBUG
+  if (ly_is_procedure (modification_callback))
+      scm_apply_0 (modification_callback,
+		   scm_list_n (self_scm (),
+			       scm_makfrom0str (file),
+			       scm_from_int (line),
+			       scm_makfrom0str (fun),
+			       sym, v, SCM_UNDEFINED));
+#endif
+
   mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, v);
 }
 
 //#define PROFILE_PROPERTY_ACCESSES
 SCM
-Grob::get_property_data (SCM sym) const
+Grob::internal_get_property_data (SCM sym) const
 {
 #ifndef NDEBUG
   if (profile_property_accesses)
@@ -108,6 +145,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
@@ -134,7 +172,8 @@ Grob::try_callback (SCM sym, SCM proc)
   else if (is_simple_closure (proc))
     {
       value = evaluate_with_simple_closure (self_scm (),
-					    simple_closure_expression (proc));
+					    simple_closure_expression (proc),
+					    false, 0, 0);
     }
 #ifndef NDEBUG
   if (debug_property_callbacks)
@@ -153,7 +192,7 @@ Grob::try_callback (SCM sym, SCM proc)
 	mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, marker);
     }
   else
-    internal_set_property (sym, value);
+    set_property (sym, value);
 	  
   return value;
 }
@@ -169,7 +208,7 @@ Grob::internal_set_object (SCM s, SCM v)
 }
 
 void
-Grob::del_property (SCM sym)
+Grob::internal_del_property (SCM sym)
 {
   mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, sym);
 }
@@ -189,5 +228,20 @@ Grob::internal_get_object (SCM sym) const
 bool
 Grob::is_live () const
 {
-  return immutable_property_alist_ != SCM_EOL;
+  return scm_is_pair (immutable_property_alist_);
+}
+
+bool
+Grob::internal_has_interface (SCM k)
+{
+  return scm_c_memq (k, interfaces_) != SCM_BOOL_F;
+}
+
+SCM
+call_pure_function (SCM unpure, SCM args, int start, int end)
+{
+  SCM scm_call_pure_function = ly_lily_module_constant ("call-pure-function");
+
+  return scm_apply_0 (scm_call_pure_function,
+		      scm_list_4 (unpure, args, scm_from_int (start), scm_from_int (end)));
 }