*/
#include "align-interface.hh"
-
#include "score-element.hh"
#include "group-interface.hh"
#include "axis-group-interface.hh"
+#include "paper-def.hh"
/*
This callback is set in the children of the align element. It does
not compute anything, but a side effect of a->do_side_processing ()
is that the elements are placed correctly. */
-Real
-Align_interface::alignment_callback (Score_element *sc, Axis ax)
+MAKE_SCHEME_CALLBACK(Align_interface,alignment_callback,2);
+SCM
+Align_interface::alignment_callback (SCM element_smob, SCM axis)
{
- Score_element * par = sc->parent_l (ax);
+ Score_element * me = unsmob_element (element_smob);
+ Axis ax = (Axis )gh_scm2int (axis);
+ Score_element * par = me->parent_l (ax);
if (par && !to_boolean (par->get_elt_property ("alignment-done")))
{
Align_interface::do_side_processing (par, ax);
}
- return 0.0;
+ return gh_double2scm (0.0);
}
-Real
-Align_interface::center_on_element (Score_element *me, Axis a)
-{
- Score_element *cent = unsmob_element (me->get_elt_property ("group-center-element"));
-
- if (cent)
- {
- Real r = cent->relative_coordinate (me, a);
- return -r;
- }
- return 0;
-}
-
/*
Hairy function to put elements where they should be. Can be tweaked
from the outside by setting minimum-space and extra-space in its
= Pointer_group_interface__extract_elements ( me, (Score_element*) 0, "elements");
for (int i=0; i < all_elts.size(); i++)
{
- Interval y = all_elts[i]->extent(a) + all_elts[i]->relative_coordinate (me, a);
+ Interval y = all_elts[i]->extent(me, a);
if (!y.empty_b())
{
Score_element *e =dynamic_cast<Score_element*>(all_elts[i]);
gh_number_p (gh_car (min_dims))
&& gh_number_p (gh_cdr (min_dims)))
{
- y.unite (Interval (gh_scm2double (gh_car (min_dims)),
- gh_scm2double (gh_cdr (min_dims))));
+ y.unite (ly_scm2interval (min_dims));
+
}
SCM extra_dims = e->remove_elt_property ("extra-space");
SCM thr = me->get_elt_property ("threshold");
if (gh_pair_p (thr))
{
- threshold[SMALLER] = gh_scm2double (gh_car (thr));
- threshold[BIGGER] = gh_scm2double (gh_cdr (thr));
+ Real ss = 1.0;
+ threshold[SMALLER] = ss *gh_scm2double (gh_car (thr));
+ threshold[BIGGER] = ss * gh_scm2double (gh_cdr (thr));
}
Real where_f=0;
- for (int i=0 ; i < elems.size(); i++)
+ for (int j=0 ; j < elems.size(); j++)
{
- Real dy = - stacking_dir * dims[i][-stacking_dir];
- if (i)
- dy += stacking_dir * dims[i-1][stacking_dir];
+ Real dy = - stacking_dir * dims[j][-stacking_dir];
+ if (j)
+ dy += stacking_dir * dims[j-1][stacking_dir];
- if (i)
+ if (j)
{
dy = (dy >? threshold[SMALLER] )
<? threshold[BIGGER];
}
where_f += stacking_dir * dy;
- elems[i]->translate_axis (where_f, a);
+ elems[j]->translate_axis (where_f, a);
}
}
void
Align_interface::add_element (Score_element*me,Score_element* s)
{
- s->add_offset_callback (alignment_callback, Align_interface::axis (me));
+ s->add_offset_callback (Align_interface::alignment_callback_proc, Align_interface::axis (me));
Axis_group_interface::add_element (me, s);
}