source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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. */
-MAKE_SCHEME_CALLBACK(Align_interface,alignment_callback,2);
+MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2);
SCM
Align_interface::alignment_callback (SCM element_smob, SCM axis)
{
Grob * me = unsmob_grob (element_smob);
- Axis ax = (Axis )gh_scm2int (axis);
+ 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_extents (par, ax);
+ Align_interface::align_elements_to_extents (par, ax);
}
return gh_double2scm (0.0);
}
-MAKE_SCHEME_CALLBACK(Align_interface,fixed_distance_alignment_callback,2);
+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);
+ Axis ax = (Axis)gh_scm2int (axis);
Grob * par = me->parent_l (ax);
if (par && !to_boolean (par->get_grob_property ("alignment-done")))
{
return gh_double2scm (0.0);
}
+/*
+ merge with align-to-extents?
+ */
void
Align_interface::align_to_fixed_distance (Grob *me , Axis a)
{
SCM d = me->get_grob_property ("stacking-dir");
- Direction stacking_dir = gh_number_p(d) ? to_dir (d) : CENTER;
+ Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
}
Link_array<Grob> elems
- = Pointer_group_interface__extract_elements ( me, (Grob*) 0, "elements");
+ = Pointer_group_interface__extract_elements (me, (Grob*) 0, "elements");
+
Real where_f=0;
- for (int j=0 ; j < elems.size(); j++)
+
+ Interval v;
+ v.set_empty ();
+ Array<Real> translates;
+
+ for (int j=0 ; j < elems.size (); j++)
{
where_f += stacking_dir * dy;
- elems[j]->translate_axis (where_f, a);
+ translates.push (where_f);
+ v.unite (Interval (where_f, where_f));
+ }
+
+ /*
+ TODO: support self-alignment-{Y,X}
+ */
+ for (int i = 0; i < translates.size (); i++)
+ {
+ elems[i]->translate_axis (translates[i] - v.center (), a);
}
}
/*
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 */
+ children
+
+ We assume that the children the refpoints of the children are still
+ found at 0.0 -- we will fuck up with thresholds if children's
+ extents are already moved to locations such as (-16, -8), since the
+ dy needed to put things in a row doesn't relate to the distances
+ between original refpoints.
+
+ TODO: maybe we should rethink and throw out thresholding altogether.
+ The original function has been taken over by
+ align_to_fixed_distance().
+*/
void
-Align_interface::align_to_extents (Grob * me, Axis a)
+Align_interface::align_elements_to_extents (Grob * me, Axis a)
{
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;
+ Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
Link_array<Grob> elems;
Link_array<Grob> all_grobs
- = Pointer_group_interface__extract_elements ( me, (Grob*) 0, "elements");
- for (int i=0; i < all_grobs.size(); i++)
+ = Pointer_group_interface__extract_elements (me, (Grob*) 0, "elements");
+ for (int i=0; i < all_grobs.size (); i++)
{
- Interval y = all_grobs[i]->extent(me, a);
- if (!y.empty_b())
+ Interval y = all_grobs[i]->extent (me, a);
+ if (!y.empty_b ())
{
- Grob *e =dynamic_cast<Grob*>(all_grobs[i]);
+ Grob *e =dynamic_cast<Grob*> (all_grobs[i]);
// todo: fucks up if item both in Halign & Valign.
SCM min_dims = e->remove_grob_property ("minimum-space");
&& gh_number_p (gh_cdr (min_dims)))
{
y.unite (ly_scm2interval (min_dims));
-
}
SCM extra_dims = e->remove_grob_property ("extra-space");
gh_number_p (gh_car (extra_dims))
&& gh_number_p (gh_cdr (extra_dims)))
{
- y[LEFT] += gh_scm2double (gh_car (extra_dims));
+ y[LEFT] += gh_scm2double (gh_car (extra_dims));
y[RIGHT] += gh_scm2double (gh_cdr (extra_dims));
}
}
- Real where_f=0;
+ /*
+ Read self-alignment-X and self-alignment-Y. This may seem like
+ code duplication. (and really: it is), but this is necessary to
+ prevent ugly cyclic dependencies that arise when you combine
+ self-alignment on a child with alignment of children.
+ */
+
+ String s ("self-alignment-");
+
+ s += (a == X_AXIS) ? "X" : "Y";
+
+ SCM align (me->get_grob_property (s.ch_C ()));
+
Array<Real> translates ;
- for (int j=0 ; j < elems.size(); j++)
+ Interval total;
+ Real where_f=0;
+
+ for (int j=0 ; j < elems.size (); j++)
{
- Real dy = 0.0;
- dy = - stacking_dir * dims[j][-stacking_dir];
+ Real dy = - dims[j][-stacking_dir];
if (j)
- dy += stacking_dir * dims[j-1][stacking_dir];
-
+ dy += dims[j-1][stacking_dir];
+
+
+ /*
+ we want dy to be > 0
+ */
+ dy *= stacking_dir;
if (j)
{
- dy = (dy >? threshold[SMALLER] )
+ dy = (dy >? threshold[SMALLER])
<? threshold[BIGGER];
}
where_f += stacking_dir * dy;
+ total.unite (dims[j] + where_f);
translates.push (where_f);
}
+
+ Grob * align_center = unsmob_grob (align);
+ Real center_offset = 0.0;
+
/*
also move the grobs that were empty, to maintain spatial order.
*/
- if (translates.size ())
+ Array<Real> all_translates;
+ if (translates.size ())
{
int i =0;
int j =0;
{
w = translates[i++];
}
- all_grobs[j]->translate_axis (w, a);
-
+ if (all_grobs[j] == align_center)
+ center_offset = w;
+ all_translates .push (w);
j++;
}
+
+
+ /*
+ FIXME: uncommenting freaks out the Y-alignment of
+ line-of-score.
+ */
+ // Real align_param = isdir_b (align) ? gh_scm2double (align) : 0.0;
+
+ if (gh_number_p (align))
+ center_offset = total.linear_combination (gh_scm2double (align));
+
+ for (int j = 0 ; j < all_grobs.size (); j++)
+ all_grobs[j]->translate_axis (all_translates[j] - center_offset, a);
}
}
-
Axis
Align_interface::axis (Grob*me)
{
void
Align_interface::set_axis (Grob*me,Axis a)
{
- Axis_group_interface::set_axes (me, a,a );
+ Axis_group_interface::set_axes (me, a,a);
}
bool
projects / lilypond.git / blobdiff