X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-closure.cc;h=4f6c0adc81f5219836e20c2bb92754f347a20eab;hb=174f5edb85ffdfe5ba808e48131ac03d59f478a7;hp=c1610e89d635ef699132615c40d6a91071bb0f50;hpb=0ada3837f91b0e14cf7c588351d020b88e50d604;p=lilypond.git

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index c1610e89d6..4f6c0adc81 100644
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -1,28 +1,22 @@
 #include "grob.hh"
 #include "simple-closure.hh"
 
-/*
-  UGH : todo -> to different file.
- */
-
 SCM
 axis_offset_symbol (Axis a)
 {
   return a == X_AXIS
-    ? ly_symbol2scm ("X-offset")
-    : ly_symbol2scm ("Y-offset");
+         ? ly_symbol2scm ("X-offset")
+         : ly_symbol2scm ("Y-offset");
 }
 
 SCM
 axis_parent_positioning (Axis a)
 {
   return (a == X_AXIS)
-    ? Grob::x_parent_positioning_proc
-    : Grob::y_parent_positioning_proc;
+         ? Grob::x_parent_positioning_proc
+         : Grob::y_parent_positioning_proc;
 }
 
-
-
 /*
   Replace
 
@@ -31,30 +25,32 @@ axis_parent_positioning (Axis a)
   by
 
   (+ (PROC GROB) (orig-proc GROB))
-  
 */
 void
 add_offset_callback (Grob *g, SCM proc, Axis a)
 {
   SCM data = g->get_property_data (axis_offset_symbol (a));
+  if (!scm_is_number (data)
+      && !ly_is_procedure (data)
+      && !is_simple_closure (data))
+    {
+      g->set_property (axis_offset_symbol (a), proc);
+      return;
+    }
+
   if (ly_is_procedure (data))
-    data = ly_make_simple_closure (scm_list_1  (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))
-    g->internal_set_property (axis_offset_symbol (a),
-			      proc);
-  else
-    {
-      SCM plus = ly_lily_module_constant ("+");
-      SCM expr = scm_list_3 (plus,
-			     ly_make_simple_closure (scm_list_1 (proc)),
-			     data);
-      g->internal_set_property (axis_offset_symbol (a),
-				ly_make_simple_closure (expr));
-    }
-}
 
+  SCM plus = ly_lily_module_constant ("+");
+
+  if (ly_is_procedure (proc))
+    proc = ly_make_simple_closure (scm_list_1 (proc));
+
+  SCM expr = scm_list_3 (plus, proc, data);
+  g->set_property (axis_offset_symbol (a), ly_make_simple_closure (expr));
+}
 
 /*
   replace
@@ -63,25 +59,35 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
 
   by
 
-  (PROC GROB (orig-proc GROB)) 
-
+  (PROC GROB (orig-proc GROB))
 */
 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));
+    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));
 }