*/
#include "align-interface.hh"
-#include "dimension-cache.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 (Dimension_cache const *c)
+MAKE_SCHEME_CALLBACK(Align_interface,alignment_callback,2);
+SCM
+Align_interface::alignment_callback (SCM element_smob, SCM axis)
{
- Axis ax = c->axis ();
- Score_element * sc = c->element_l ()->parent_l (ax);
-
- if (sc && sc->get_elt_property ("alignment-done") == SCM_UNDEFINED)
+ Grob * me = unsmob_element (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 (sc).do_side_processing (ax);
+ Align_interface::do_side_processing (par, ax);
}
- return 0.0;
+ return gh_double2scm (0.0);
}
-Real
-Align_interface::center_on_element (Dimension_cache const *c)
-{
- Score_element *me = c->element_l ();
- Score_element *cent = unsmob_element (me->get_elt_property ("group-center-element"));
-
- if (cent)
- {
- Real r = cent->relative_coordinate (me, c->axis ());
- 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
children */
void
-Align_interface::do_side_processing (Axis a)
+Align_interface::do_side_processing (Grob * me, Axis a)
{
- elt_l_->set_elt_property ("alignment-done", SCM_BOOL_T);
+ me->set_grob_property ("alignment-done", SCM_BOOL_T);
- SCM d = elt_l_->get_elt_property ("stacking-dir");
+ 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;
Array<Interval> dims;
- Link_array<Score_element> elems;
- Link_array<Score_element> all_elts
- = Group_interface__extract_elements ( elt_l_, (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 (elt_l_, 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)))
Interval threshold = Interval (0, Interval::infinity ());
- SCM thr = elt_l_->get_elt_property ("threshold");
+ 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));
+ 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);
}
}
Axis
-Align_interface::axis ()const
+Align_interface::axis (Grob*me)
{
- return Axis (gh_scm2int (gh_car (elt_l_->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*s)const
+Align_interface::get_count (Grob*me,Grob*s)
{
- SCM e = elt_l_->get_elt_property ("elements");
+ SCM e = me->get_grob_property ("elements");
int c =0;
while (gh_pair_p (e))
{
- if (gh_car (e) == s->self_scm_)
+ if (gh_car (e) == s->self_scm ())
break;
c++;
e = gh_cdr (e);
}
void
-Align_interface::add_element (Score_element* s)
+Align_interface::add_element (Grob*me,Grob* s)
{
- s->add_offset_callback (alignment_callback, axis ());
- Axis_group_interface (elt_l_).add_element (s);
-
+ s->add_offset_callback (Align_interface::alignment_callback_proc, Align_interface::axis (me));
+ Axis_group_interface::add_element (me, s);
}
-Align_interface::Align_interface (Score_element const*s)
-{
- elt_l_ = (Score_element*)s;
-}
void
-Align_interface::set_interface ()
+Align_interface::set_interface (Grob*me)
{
- Axis_group_interface (elt_l_).set_interface ();
+ me->set_interface (ly_symbol2scm ("align-interface"));
- Group_interface (elt_l_, "interfaces").add_thing (ly_symbol2scm ("Alignment"));
+ Axis_group_interface::set_interface (me);
}
void
-Align_interface::set_axis (Axis a)
+Align_interface::set_axis (Grob*me,Axis a)
{
- Axis_group_interface (elt_l_).set_axes (a,a );
+ Axis_group_interface::set_axes (me, a,a );
}
bool
-Align_interface::has_interface_b ()
+Align_interface::has_interface (Grob*me)
{
- SCM memq = scm_memq (ly_symbol2scm ("Alignment"),
- elt_l_->get_elt_property ("interfaces"));
-
- return (memq != SCM_BOOL_F);
+ return me && me->has_interface (ly_symbol2scm ("align-interface"));
}
projects / lilypond.git / blobdiff