#include "grob.hh"
#include "simple-closure.hh"
+#include "unpure-pure-container.hh"
SCM
axis_offset_symbol (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))
+ && !unsmob<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);
+ if (ly_is_procedure (data) || unsmob<Unpure_pure_container> (data))
+ data = Simple_closure::make_smob (scm_list_1 (data));
+ else if (Simple_closure *sc = unsmob<Simple_closure> (data))
+ data = sc->expression ();
SCM plus = ly_lily_module_constant ("+");
if (ly_is_procedure (proc))
- proc = ly_make_simple_closure (scm_list_1 (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), ly_make_simple_closure (expr));
+ g->set_property (axis_offset_symbol (a), Simple_closure::make_smob (expr));
}
/*
{
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);
+ if (ly_is_procedure (data) || unsmob<Unpure_pure_container> (data))
+ data = Simple_closure::make_smob (scm_list_1 (data));
+ else if (Simple_closure *sc = unsmob<Simple_closure> (data))
+ data = sc->expression ();
else
/*
Data may be nonnumber. In that case, it is assumed to be
// twice: one as a wrapper for grob property routines,
// once for the actual delayed binding.
- ly_make_simple_closure (ly_make_simple_closure (expr)));
+ Simple_closure::make_smob (Simple_closure::make_smob (expr)));
}
void