source file of the GNU LilyPond music typesetter
- (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
Grob * me = unsmob_grob (element_smob);
Axis ax = (Axis)gh_scm2int (axis);
Grob * par = me->get_parent (ax);
- if (par && !to_boolean (par->get_grob_property ("alignment-done")))
+ if (par && !to_boolean (par->get_grob_property ("positioning-done")))
{
Align_interface::align_elements_to_extents (par, ax);
}
Grob * me = unsmob_grob (element_smob);
Axis ax = (Axis)gh_scm2int (axis);
Grob * par = me->get_parent (ax);
- if (par && !to_boolean (par->get_grob_property ("alignment-done")))
+ if (par && !to_boolean (par->get_grob_property ("positioning-done")))
{
Align_interface::align_to_fixed_distance (par, ax);
}
void
Align_interface::align_to_fixed_distance (Grob *me , Axis a)
{
- me->set_grob_property ("alignment-done", SCM_BOOL_T);
+ me->set_grob_property ("positioning-done", SCM_BOOL_T);
SCM d = me->get_grob_property ("stacking-dir");
if (!stacking_dir)
stacking_dir = DOWN;
- SCM force = me->get_grob_property ("forced-distance");
-
- Real dy = 0.0;
- if (gh_number_p (force))
- {
- dy = gh_scm2double (force);
- }
+ Real dy = robust_scm2double (me->get_grob_property ("forced-distance"),0.0);
Link_array<Grob> elems
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
&& Hara_kiri_group_spanner::has_interface (elems[j]))
Hara_kiri_group_spanner::consider_suicide (elems[j]);
- if (!ly_pair_p (elems[j]-> immutable_property_alist_))
+ if (!elems[j]-> live())
elems.del(j);
}
/*
Hairy function to put elements where they should be. Can be tweaked
- from the outside by setting minimum-space-pair and extra-space in its
+ from the outside by setting extra-space in its
children
We assume that the children the refpoints of the children are still
void
Align_interface::align_elements_to_extents (Grob * me, Axis a)
{
- me->set_grob_property ("alignment-done", SCM_BOOL_T);
+ me->set_grob_property ("positioning-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;
-
-
- Interval threshold = Interval (0, Interval::infinity ());
- SCM thr = me->get_grob_property ("threshold");
- if (gh_pair_p (thr))
- {
- threshold[SMALLER] = gh_scm2double (ly_car (thr));
- threshold[BIGGER] = gh_scm2double (ly_cdr (thr));
- }
-
+ Interval threshold = robust_scm2interval ( me->get_grob_property ("threshold"), Interval (0, Interval::infinity ()));
Array<Interval> dims;
for (int i=0; i < all_grobs.size (); i++)
{
Interval y = all_grobs[i]->extent (me, a);
- if (!y.empty_b ())
+ if (!y.is_empty ())
{
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-pair");
- if (gh_pair_p (min_dims) &&
- gh_number_p (ly_car (min_dims))
- && gh_number_p (ly_cdr (min_dims)))
- {
- y.unite (ly_scm2interval (min_dims));
- }
-
- SCM extra_dims = e->remove_grob_property ("extra-space");
- if (gh_pair_p (extra_dims) &&
- gh_number_p (ly_car (extra_dims))
- && gh_number_p (ly_cdr (extra_dims)))
- {
- y[LEFT] += gh_scm2double (ly_car (extra_dims));
- y[RIGHT] += gh_scm2double (ly_cdr (extra_dims));
- }
-
elems.push (e);
dims.push (y);
}
prevent ugly cyclic dependencies that arise when you combine
self-alignment on a child with alignment of children.
*/
+ static SCM prop_syms[2];
- String s ("self-alignment-");
-
- s += (a == X_AXIS) ? "X" : "Y";
-
- SCM align (me->get_grob_property (s.ch_C ()));
-
+ if (!prop_syms[0])
+ {
+ prop_syms[X_AXIS] = ly_symbol2scm ("self-alignment-X");
+ prop_syms[Y_AXIS] = ly_symbol2scm ("self-alignment-Y");
+ }
+
+ SCM align (me->internal_get_grob_property (prop_syms[a]));
+
Array<Real> translates ;
Interval total;
Real where_f=0;
FIXME: uncommenting freaks out the Y-alignment of
line-of-score.
*/
- // Real align_param = isdir_b (align) ? gh_scm2double (align) : 0.0;
+ // Real align_param = is_direction (align) ? gh_scm2double (align) : 0.0;
if (gh_number_p (align))
center_offset = total.linear_combination (gh_scm2double (align));
return Axis (gh_scm2int (ly_car (me->get_grob_property ("axes"))));
}
-
-/*
- should use generic Scm funcs.
- */
-int
-Align_interface::get_count (Grob*me,Grob*s)
-{
- SCM e = me->get_grob_property ("elements");
- int c =0;
- while (gh_pair_p (e))
- {
- if (ly_car (e) == s->self_scm ())
- break;
- c++;
- e = ly_cdr (e);
- }
- return c;
-}
-
void
Align_interface::add_element (Grob*me,Grob* s, SCM cb)
{
Axis_group_interface::add_element (me, s);
}
-
-void
-Align_interface::set_interface (Grob*me)
-{
- me->set_interface (ly_symbol2scm ("align-interface"));
-
- Axis_group_interface::set_interface (me);
-}
-
void
Align_interface::set_axis (Grob*me,Axis a)
{
Axis_group_interface::set_axes (me, a,a);
}
-bool
-Align_interface::has_interface (Grob*me)
+
+/*
+ Find Y-axis parent of G that has a #'forced-distance property. This
+ has the effect of finding the piano-staff given an object in that
+ piano staff.
+ */
+Grob *
+find_fixed_alignment_parent (Grob *g)
{
- return me && me->has_interface (ly_symbol2scm ("align-interface"));
+ while (g)
+ {
+ if (gh_number_p (g->get_grob_property ("forced-distance")))
+ return g;
+
+ g = g->get_parent (Y_AXIS);
+ }
+
+ return 0;
}
+
+
+
+ADD_INTERFACE (Align_interface, "align-interface",
+ " Order grobs top to bottom/left to right/right to left etc.",
+ "forced-distance stacking-dir align-dir threshold positioning-done center-element elements axes");
+
+
+struct Foobar
+{
+ bool has_interface (Grob*);
+};
+
projects / lilypond.git / blobdiff