X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=47d90b7b2494d711f58ad5f610061dcfaef45c01;hb=e37010af17faa8b185de836664b6544bd29dc1d0;hp=58077373c847f5525c577ae7ba0dbfb139fc577a;hpb=fe551209fdc4301746a0ece6ca1fb674db24b5a5;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 58077373c8..47d90b7b24 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ @@ -11,128 +11,136 @@ #include "grob.hh" #include "group-interface.hh" #include "axis-group-interface.hh" +#include "hara-kiri-group-spanner.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. */ -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); - Grob * par = me->parent_l (ax); - if (par && !to_boolean (par->get_grob_property ("alignment-done"))) + Axis ax = (Axis)gh_scm2int (axis); + Grob * par = me->get_parent (ax); + if (par && !to_boolean (par->get_grob_property ("positioning-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); - Grob * par = me->parent_l (ax); - if (par && !to_boolean (par->get_grob_property ("alignment-done"))) + Axis ax = (Axis)gh_scm2int (axis); + Grob * par = me->get_parent (ax); + if (par && !to_boolean (par->get_grob_property ("positioning-done"))) { Align_interface::align_to_fixed_distance (par, ax); } return gh_double2scm (0.0); } +/* + merge with align-to-extents? + */ 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"); - - 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; + Real dy = robust_scm2double (me->get_grob_property ("forced-distance"),0.0); + + Link_array elems + = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements"); - SCM force = me->get_grob_property ("forced-distance"); + Real where_f=0; - Real dy = 0.0; - if (gh_number_p (force)) + Interval v; + v.set_empty (); + Array translates; + + for (int j= elems.size (); j--; ) { - dy = gh_scm2double (force); + /* + This is not very elegant, in that we need special support for + hara kiri. Unfortunately, the generic wiring of + force_hara_kiri_callback () (extent and offset callback) is + such that we might get into a loop if we call extent() or + offset() the elements. + + + */ + if (a == Y_AXIS + && Hara_kiri_group_spanner::has_interface (elems[j])) + Hara_kiri_group_spanner::consider_suicide (elems[j]); + + if (!elems[j]-> live()) + elems.del(j); } - - Link_array elems - = Pointer_group_interface__extract_elements ( me, (Grob*) 0, "elements"); - Real where_f=0; - for (int j=0 ; j < elems.size(); j++) + + 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 */ + from the outside by setting extra-space in its + 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); + 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; + 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)); - } - + Interval threshold = robust_scm2interval ( me->get_grob_property ("threshold"), Interval (0, Interval::infinity ())); Array dims; Link_array elems; - Link_array all_elts - = Pointer_group_interface__extract_elements ( me, (Grob*) 0, "elements"); - for (int i=0; i < all_elts.size(); i++) + Link_array all_grobs + = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements"); + for (int i=0; i < all_grobs.size (); i++) { - Interval y = all_elts[i]->extent(me, a); - if (!y.empty_b()) + Interval y = all_grobs[i]->extent (me, a); + if (!y.is_empty ()) { - Grob *e =dynamic_cast(all_elts[i]); - - // todo: fucks up if item both in Halign & Valign. - 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 (ly_scm2interval (min_dims)); - - } - - 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))) - { - y[LEFT] += gh_scm2double (gh_car (extra_dims)); - y[RIGHT] += gh_scm2double (gh_cdr (extra_dims)); - } + Grob *e =dynamic_cast (all_grobs[i]); elems.push (e); dims.push (y); @@ -140,49 +148,85 @@ Align_interface::align_to_extents (Grob * me, Axis a) } + /* + 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. + */ + static SCM prop_syms[2]; + + 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 translates ; + Interval total; Real where_f=0; - for (int j=0 ; j < elems.size(); j++) + + 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]) translate_axis (where_f, a); + total.unite (dims[j] + where_f); + translates.push (where_f); } -} + + Real center_offset = 0.0; + /* + also move the grobs that were empty, to maintain spatial order. + */ + Array all_translates; + if (translates.size ()) + { + int i =0; + int j =0; + Real w = translates[0]; + while (j < all_grobs.size ()) + { + if (i < elems.size () && all_grobs[j] == elems[i]) + { + w = translates[i++]; + } + all_translates.push (w); + j++; + } -Axis -Align_interface::axis (Grob*me) -{ - return Axis (gh_scm2int (gh_car (me->get_grob_property ("axes")))); -} + /* + FIXME: uncommenting freaks out the Y-alignment of + line-of-score. + */ + if (gh_number_p (align)) + center_offset = total.linear_combination (gh_scm2double (align)); -/* - 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 (gh_car (e) == s->self_scm ()) - break; - c++; - e = gh_cdr (e); + for (int j = 0 ; j < all_grobs.size (); j++) + all_grobs[j]->translate_axis (all_translates[j] - center_offset, a); } - return c; +} +Axis +Align_interface::axis (Grob*me) +{ + return Axis (gh_scm2int (ly_car (me->get_grob_property ("axes")))); } void @@ -192,24 +236,45 @@ Align_interface::add_element (Grob*me,Grob* s, SCM cb) Axis_group_interface::add_element (me, s); } - void -Align_interface::set_interface (Grob*me) +Align_interface::set_axis (Grob*me,Axis a) { - me->set_interface (ly_symbol2scm ("align-interface")); - - Axis_group_interface::set_interface (me); + Axis_group_interface::set_axes (me, a,a); } -void -Align_interface::set_axis (Grob*me,Axis a) + +/* + 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) { - Axis_group_interface::set_axes (me, a,a ); + while (g) + { + if (gh_number_p (g->get_grob_property ("forced-distance"))) + return g; + + g = g->get_parent (Y_AXIS); + } + + return 0; } -bool -Align_interface::has_interface (Grob*me) + + + +ADD_INTERFACE (Align_interface, "align-interface", + "Order grobs from top to bottom, left to right, right to left or bottom" + "to top." + , + "forced-distance stacking-dir align-dir threshold positioning-done " + "center-element elements axes"); + + +struct Foobar { - return me && me->has_interface (ly_symbol2scm ("align-interface")); -} + bool has_interface (Grob*); +};