X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=3928ae8f6eb13cdd9184c1a5e27fa3b11bbdd0fe;hb=08da6e274ea516076699e8e9bbdd48e5919cb526;hp=42d7846cb4a9ac28b355113628c27628c86359f2;hpb=635827994d372f4bd0e9c719238380337bae9477;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 42d7846cb4..3928ae8f6e 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--2001 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ @@ -19,13 +19,13 @@ 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)ly_scm2int (axis); + Grob * par = me->get_parent (ax); + if (par && !to_boolean (par->get_property ("positioning-done"))) { Align_interface::align_elements_to_extents (par, ax); } - return gh_double2scm (0.0); + return scm_make_real (0.0); } MAKE_SCHEME_CALLBACK (Align_interface,fixed_distance_alignment_callback,2); @@ -33,13 +33,13 @@ 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)ly_scm2int (axis); + Grob * par = me->get_parent (ax); + if (par && !to_boolean (par->get_property ("positioning-done"))) { Align_interface::align_to_fixed_distance (par, ax); } - return gh_double2scm (0.0); + return scm_make_real (0.0); } /* @@ -48,24 +48,18 @@ Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis) void Align_interface::align_to_fixed_distance (Grob *me , Axis a) { - me->set_grob_property ("alignment-done", SCM_BOOL_T); + me->set_property ("positioning-done", SCM_BOOL_T); - SCM d = me->get_grob_property ("stacking-dir"); + SCM d = me->get_property ("stacking-dir"); - Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER; + Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER; 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_property ("forced-distance"),0.0); Link_array elems - = Pointer_group_interface__extract_elements (me, (Grob*) 0, "elements"); + = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements"); Real where_f=0; @@ -77,10 +71,10 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) { /* This is not very elegant, in that we need special support for - hara kiri. Unfortunately, the generic wiring of + 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. + such that we might get into a loop if we call extent () or + offset () the elements. */ @@ -88,8 +82,8 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) && 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_)) - elems.del(j); + if (!elems[j]->live ()) + elems.del (j); } for (int j =0; j < elems.size (); j++) @@ -110,7 +104,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis 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 + from the outside by setting extra-space in its children We assume that the children the refpoints of the children are still @@ -121,61 +115,33 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) TODO: maybe we should rethink and throw out thresholding altogether. The original function has been taken over by - align_to_fixed_distance(). + align_to_fixed_distance (). */ void Align_interface::align_elements_to_extents (Grob * me, Axis a) { - me->set_grob_property ("alignment-done", SCM_BOOL_T); + me->set_property ("positioning-done", SCM_BOOL_T); - SCM d = me->get_grob_property ("stacking-dir"); - + SCM d = me->get_property ("stacking-dir"); - Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER; + Direction stacking_dir = ly_c_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_property ("threshold"), Interval (0, Interval::infinity ())); Array dims; Link_array elems; Link_array all_grobs - = Pointer_group_interface__extract_elements (me, (Grob*) 0, "elements"); + = Pointer_group_interface__extract_grobs (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 ()) + if (!y.is_empty ()) { Grob *e =dynamic_cast (all_grobs[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 (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); } @@ -188,13 +154,16 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) 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_property (prop_syms[a])); + Array translates ; Interval total; Real where_f=0; @@ -222,12 +191,10 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) } - Grob * align_center = unsmob_grob (align); Real center_offset = 0.0; - /* also move the grobs that were empty, to maintain spatial order. - */ + */ Array all_translates; if (translates.size ()) { @@ -240,9 +207,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) { w = translates[i++]; } - if (all_grobs[j] == align_center) - center_offset = w; - all_translates .push (w); + all_translates.push (w); j++; } @@ -251,10 +216,8 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) 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)); + if (ly_c_number_p (align)) + center_offset = total.linear_combination (ly_scm2double (align)); for (int j = 0 ; j < all_grobs.size (); j++) all_grobs[j]->translate_axis (all_translates[j] - center_offset, a); @@ -263,26 +226,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) Axis Align_interface::axis (Grob*me) { - 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; + return Axis (ly_scm2int (ly_car (me->get_property ("axes")))); } void @@ -292,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) -{ - 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 (ly_c_number_p (g->get_property ("forced-distance"))) + return g; + + g = g->get_parent (Y_AXIS); + } + + return 0; } + + + +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 +{ + bool has_interface (Grob*); +}; +