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

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index ee4d1b0407..bfafd4c982 100644
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -1,6 +1,6 @@
 #include "grob.hh"
-#include "simple-closure.hh"
 #include "unpure-pure-container.hh"
+#include "lily-imports.hh"
 
 SCM
 axis_offset_symbol (Axis a)
@@ -30,27 +30,9 @@ axis_parent_positioning (Axis a)
 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)
-      && !Simple_closure::is_smob (data))
-    {
-      g->set_property (axis_offset_symbol (a), proc);
-      return;
-    }
-
-  if (ly_is_procedure (data) || Unpure_pure_container::is_smob (data))
-    data = Simple_closure::make_smob (scm_list_1 (data));
-  else if (Simple_closure *sc = Simple_closure::unsmob (data))
-    data = sc->expression ();
-
-  SCM plus = ly_lily_module_constant ("+");
-
-  if (ly_is_procedure (proc))
-    proc = Simple_closure::make_smob (scm_list_1 (proc));
-
-  SCM expr = scm_list_3 (plus, proc, data);
-  g->set_property (axis_offset_symbol (a), Simple_closure::make_smob (expr));
+  SCM sym = axis_offset_symbol (a);
+  SCM data = g->get_property_data (sym);
+  g->set_property (sym, Lily::grob_offset_function (proc, data));
 }
 
 /*
@@ -66,25 +48,7 @@ void
 chain_callback (Grob *g, SCM proc, SCM sym)
 {
   SCM data = g->get_property_data (sym);
-
-  if (ly_is_procedure (data) || Unpure_pure_container::is_smob (data))
-    data = Simple_closure::make_smob (scm_list_1 (data));
-  else if (Simple_closure *sc = Simple_closure::unsmob (data))
-    data = sc->expression ();
-  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->set_property (sym,
-
-                   // twice: one as a wrapper for grob property routines,
-                   // once for the actual delayed binding.
-                   Simple_closure::make_smob (Simple_closure::make_smob (expr)));
+  g->set_property (sym, Lily::grob_compose_function (proc, data));
 }
 
 void