Guile-1.9 compatibility fixes.

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

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index 81bd393adb98de880c1a05e26a77dc16b9fe30dc..124d1437932c034f7fa5e2ba1dd5195585dac6ad 100644 (file)
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -37,8 +37,7 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
       && !ly_is_procedure (data)
       && !is_simple_closure (data))
     {
-      g->internal_set_property (axis_offset_symbol (a),
-                               proc);
+      g->set_property (axis_offset_symbol (a), proc);
       return ;
     }
 
@@ -53,8 +52,7 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
     proc = ly_make_simple_closure (scm_list_1 (proc));
   
   SCM expr = scm_list_3 (plus, proc, data);
-  g->internal_set_property (axis_offset_symbol (a),
-                           ly_make_simple_closure (expr));
+  g->set_property (axis_offset_symbol (a), ly_make_simple_closure (expr));
 }
 
 
@@ -69,21 +67,32 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
 
 */
 void
-chain_offset_callback (Grob *g, SCM proc, Axis a)
+chain_callback (Grob *g, SCM proc, SCM sym)
 {
-  SCM data = g->get_property_data (axis_offset_symbol (a));
+  SCM data = g->get_property_data (sym);
 
   if (ly_is_procedure (data))
     data = ly_make_simple_closure (scm_list_1  (data));
   else if (is_simple_closure (data))
     data = simple_closure_expression (data);
-  else if (!scm_is_number (data))
-    data = scm_from_int (0);
-  
+  else
+    /*
+      Data may be nonnumber. In that case, it is assumed to be
+      undefined.
+    */
+
+    data = SCM_UNDEFINED;
+
   SCM expr = scm_list_2 (proc, data);
-  g->internal_set_property (axis_offset_symbol (a),
-                           
-                           // twice: one as a wrapper for grob property routines,
-                           // once for the actual delayed binding. 
-                           ly_make_simple_closure (ly_make_simple_closure (expr)));
+  g->set_property (sym,
+                  
+                  // twice: one as a wrapper for grob property routines,
+                  // once for the actual delayed binding. 
+                  ly_make_simple_closure (ly_make_simple_closure (expr)));
+}
+
+void
+chain_offset_callback (Grob *g, SCM proc, Axis a)
+{
+  chain_callback (g, proc, axis_offset_symbol (a));
 }