void
Axis_group_interface::add_element (Grob*me,Grob *e)
{
- for (SCM ax = me->get_property ("axes"); ax != SCM_EOL ; ax = ly_cdr (ax))
+ for (SCM ax = me->get_property ("axes"); ax != SCM_EOL ; ax = scm_cdr (ax))
{
- Axis a = (Axis) ly_scm2int (ly_car (ax));
+ Axis a = (Axis) scm_to_int (scm_car (ax));
if (!e->get_parent (a))
e->set_parent (me, a);
{
/*
urg. FIXME, check for Hara_kiri_group_spanner shouldn't be necessary?
-
-
*/
return me->has_extent_callback (group_extent_callback_proc, a) ||
(me->has_extent_callback (Hara_kiri_group_spanner::y_extent_proc, a));
Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts)
{
Interval r;
- for (SCM s = elts; ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
{
- Grob * se = unsmob_grob (ly_car (s));
+ Grob * se = unsmob_grob (scm_car (s));
Interval dims = se->extent (common, a);
if (!dims.is_empty ())
r.unite (dims);
Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) ly_scm2int (scm_axis);
+ Axis a = (Axis) scm_to_int (scm_axis);
SCM elts = me->get_property ("elements");
Grob * common = common_refpoint_of_list (elts, me, a);
SCM axes = me->get_property ("axes");
- if (!ly_pair_p (axes)
+ if (!scm_is_pair (axes)
|| scm_c_memq (sa1, axes) == SCM_BOOL_F
|| scm_c_memq (sa2, axes) == SCM_BOOL_F)
{
if (!has_interface (me))
return childs;
- for (SCM ep = me->get_property ("elements"); ly_pair_p (ep); ep = ly_cdr (ep))
+ for (SCM ep = me->get_property ("elements"); scm_is_pair (ep); ep = scm_cdr (ep))
{
- Grob* e = unsmob_grob (ly_car (ep));
+ Grob* e = unsmob_grob (scm_car (ep));
if (e)
childs.concat (Axis_group_interface::get_children (e));
}