*/
#include "align-interface.hh"
-
-#include "score-element.hh"
+#include "grob.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);
- if (par && !to_boolean (par->get_elt_property ("alignment-done")))
+ Grob * me = unsmob_grob (element_smob);
+ Axis ax = (Axis )gh_scm2int (axis);
+ Grob * par = me->parent_l (ax);
+ if (par && !to_boolean (par->get_grob_property ("alignment-done")))
{
- Align_interface::do_side_processing (par, ax);
+ Align_interface::align_to_extents (par, ax);
}
- return 0.0;
+ return gh_double2scm (0.0);
}
+MAKE_SCHEME_CALLBACK(Align_interface,fixed_distance_alignment_callback,2);
+SCM
+Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
+{
+ Grob * me = unsmob_grob (element_smob);
+ Axis ax = (Axis )gh_scm2int (axis);
+ Grob * par = me->parent_l (ax);
+ if (par && !to_boolean (par->get_grob_property ("alignment-done")))
+ {
+ Align_interface::align_to_fixed_distance (par, ax);
+ }
+ return gh_double2scm (0.0);
+}
-Real
-Align_interface::center_on_element (Score_element *me, Axis a)
+void
+Align_interface::align_to_fixed_distance (Grob *me , Axis a)
{
- Score_element *cent = unsmob_element (me->get_elt_property ("group-center-element"));
+ me->set_grob_property ("alignment-done", SCM_BOOL_T);
+
+ SCM d = me->get_grob_property ("stacking-dir");
+
+
+ Direction stacking_dir = gh_number_p(d) ? to_dir (d) : CENTER;
+ if (!stacking_dir)
+ stacking_dir = DOWN;
+
+
+ SCM force = me->get_grob_property ("forced-distance");
- if (cent)
+ Real dy = 0.0;
+ if (gh_number_p (force))
{
- Real r = cent->relative_coordinate (me, a);
- return -r;
+ dy = gh_scm2double (force);
+ }
+
+ Link_array<Grob> elems
+ = Pointer_group_interface__extract_elements ( me, (Grob*) 0, "elements");
+ Real where_f=0;
+ for (int j=0 ; j < elems.size(); j++)
+ {
+ where_f += stacking_dir * dy;
+ elems[j]->translate_axis (where_f, a);
}
- return 0;
}
/*
from the outside by setting minimum-space and extra-space in its
children */
void
-Align_interface::do_side_processing (Score_element * me, Axis a)
+Align_interface::align_to_extents (Grob * me, Axis a)
{
- me->set_elt_property ("alignment-done", SCM_BOOL_T);
+ me->set_grob_property ("alignment-done", SCM_BOOL_T);
+
+ SCM d = me->get_grob_property ("stacking-dir");
+
- SCM d = me->get_elt_property ("stacking-dir");
Direction stacking_dir = gh_number_p(d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
+
+
+ Interval threshold = Interval (0, Interval::infinity ());
+ SCM thr = me->get_grob_property ("threshold");
+ if (gh_pair_p (thr))
+ {
+ threshold[SMALLER] = gh_scm2double (gh_car (thr));
+ threshold[BIGGER] = gh_scm2double (gh_cdr (thr));
+ }
+
Array<Interval> dims;
- Link_array<Score_element> elems;
- Link_array<Score_element> all_elts
- = Pointer_group_interface__extract_elements ( me, (Score_element*) 0, "elements");
+ Link_array<Grob> elems;
+ Link_array<Grob> all_elts
+ = Pointer_group_interface__extract_elements ( me, (Grob*) 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]);
+ Grob *e =dynamic_cast<Grob*>(all_elts[i]);
// todo: fucks up if item both in Halign & Valign.
- SCM min_dims = e->remove_elt_property ("minimum-space");
+ SCM min_dims = e->remove_grob_property ("minimum-space");
if (gh_pair_p (min_dims) &&
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 extra_dims = e->remove_grob_property ("extra-space");
if (gh_pair_p (extra_dims) &&
gh_number_p (gh_car (extra_dims))
&& gh_number_p (gh_cdr (extra_dims)))
dims.push (y);
}
}
-
- Interval threshold = Interval (0, Interval::infinity ());
- SCM thr = me->get_elt_property ("threshold");
- if (gh_pair_p (thr))
- {
- Real ss = me->paper_l ()-> get_var ("staffspace");
- 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];
-
- if (i)
+ Real dy = 0.0;
+ dy = - stacking_dir * dims[j][-stacking_dir];
+ if (j)
+ dy += stacking_dir * dims[j-1][stacking_dir];
+
+ 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);
}
}
Axis
-Align_interface::axis (Score_element*me)
+Align_interface::axis (Grob*me)
{
- return Axis (gh_scm2int (gh_car (me->get_elt_property ("axes"))));
+ return Axis (gh_scm2int (gh_car (me->get_grob_property ("axes"))));
}
should use generic Scm funcs.
*/
int
-Align_interface::get_count (Score_element*me,Score_element*s)
+Align_interface::get_count (Grob*me,Grob*s)
{
- SCM e = me->get_elt_property ("elements");
+ SCM e = me->get_grob_property ("elements");
int c =0;
while (gh_pair_p (e))
{
}
void
-Align_interface::add_element (Score_element*me,Score_element* s)
+Align_interface::add_element (Grob*me,Grob* s, SCM cb)
{
- s->add_offset_callback (alignment_callback, Align_interface::axis (me));
+ s->add_offset_callback (cb, Align_interface::axis (me));
Axis_group_interface::add_element (me, s);
}
void
-Align_interface::set_interface (Score_element*me)
+Align_interface::set_interface (Grob*me)
{
me->set_interface (ly_symbol2scm ("align-interface"));
}
void
-Align_interface::set_axis (Score_element*me,Axis a)
+Align_interface::set_axis (Grob*me,Axis a)
{
Axis_group_interface::set_axes (me, a,a );
}
bool
-Align_interface::has_interface (Score_element*me)
+Align_interface::has_interface (Grob*me)
{
return me && me->has_interface (ly_symbol2scm ("align-interface"));
}