#include "grob.hh"
-#include "simple-closure.hh"
+#include "unpure-pure-container.hh"
+#include "lily-imports.hh"
SCM
axis_offset_symbol (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)
- && !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));
- else if (is_simple_closure (data))
- data = simple_closure_expression (data);
-
- 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));
+ SCM sym = axis_offset_symbol (a);
+ SCM data = g->get_property_data (sym);
+ g->set_property (sym, Lily::grob_offset_function (proc, data));
}
/*
chain_callback (Grob *g, SCM proc, SCM sym)
{
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
- /*
- 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.
- ly_make_simple_closure (ly_make_simple_closure (expr)));
+ g->set_property (sym, Lily::grob_compose_function (proc, data));
}
void