X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-closure.cc;h=bfafd4c9822e3a7c3f459bfd3c6f9a1ca54d246a;hb=0dcde4fc13c8091439fb8e2d77ea755357a0e7ed;hp=a3075e2cd1e4eb2ad733ab71f6884132728519e5;hpb=a5dd8f857c7857aaa4acfbddf0c2c46088e69259;p=lilypond.git

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index a3075e2cd1..bfafd4c982 100644
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -1,24 +1,23 @@
 #include "grob.hh"
-#include "simple-closure.hh"
+#include "unpure-pure-container.hh"
+#include "lily-imports.hh"
 
 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
 
@@ -27,35 +26,15 @@ 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->internal_set_property (axis_offset_symbol (a),
-				proc);
-      return ;
-    }
-
-  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);
-
-  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 sym = axis_offset_symbol (a);
+  SCM data = g->get_property_data (sym);
+  g->set_property (sym, Lily::grob_offset_function (proc, data));
 }
 
-
 /*
   replace
 
@@ -63,25 +42,17 @@ 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);
+  g->set_property (sym, Lily::grob_compose_function (proc, data));
+}
 
-  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);
-  
-  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)));
+void
+chain_offset_callback (Grob *g, SCM proc, Axis a)
+{
+  chain_callback (g, proc, axis_offset_symbol (a));
 }