X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=736ecb9096a51a48111595b51d938b74c896189a;hb=3d3de8e64c3575398be835570b839901f5c68d65;hp=034f6d58d57f069be6857fcd23517672ddf17efa;hpb=31a6650e2b2a5c1cae3237ee47b80cd43d084d53;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 034f6d58d5..736ecb9096 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--2005 Han-Wen Nienhuys + (c) 2000--2006 Han-Wen Nienhuys */ #include "align-interface.hh" @@ -13,6 +13,8 @@ #include "pointer-group-interface.hh" #include "hara-kiri-group-spanner.hh" #include "grob-array.hh" +#include "international.hh" +#include "warn.hh" /* TODO: for vertical spacing, should also include a rod & spring @@ -27,7 +29,7 @@ Align_interface::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); SCM axis = scm_car (me->get_property ("axes")); - Axis ax = (Axis)scm_to_int (axis); + Axis ax = Axis (scm_to_int (axis)); SCM force = me->get_property ("forced-distance"); if (scm_is_number (force)) @@ -49,12 +51,13 @@ Align_interface::stretch_after_break (SCM grob) Spanner *me_spanner = dynamic_cast (me); extract_grob_set (me, "elements", elems); + if (me_spanner && elems.size ()) { Grob *common = common_refpoint_of_array (elems, me, Y_AXIS); /* force position callbacks */ - for (int i = 0; i < elems.size (); i++) + for (vsize i = 0; i < elems.size (); i++) elems[i]->relative_coordinate (common, Y_AXIS); SCM details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); @@ -68,7 +71,7 @@ Align_interface::stretch_after_break (SCM grob) Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); Real delta = extra_space / elems.size() * stacking_dir; - for (int i = 0; i < elems.size (); i++) + for (vsize i = 0; i < elems.size (); i++) elems[i]->translate_axis (i * delta, Y_AXIS); } @@ -88,15 +91,15 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a) extract_grob_set (me, "elements", elem_source); - Link_array elems (elem_source); // writable.. + vector elems (elem_source); // writable.. - Real where_f = 0; + Real where = 0; Interval v; v.set_empty (); - Array translates; + vector translates; - for (int j = elems.size (); j--;) + for (vsize j = elems.size (); j--;) { /* This is not very elegant, in that we need special support for @@ -110,20 +113,20 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a) Hara_kiri_group_spanner::consider_suicide (elems[j]); if (!elems[j]->is_live ()) - elems.del (j); + elems.erase (elems.begin () + j); } - for (int j = 0; j < elems.size (); j++) + for (vsize j = 0; j < elems.size (); j++) { - where_f += stacking_dir * dy; - translates.push (where_f); - v.unite (Interval (where_f, where_f)); + where += stacking_dir * dy; + translates.push_back (where); + v.unite (Interval (where, where)); } /* TODO: support self-alignment-{Y, X} */ - for (int i = 0; i < translates.size (); i++) + for (vsize i = 0; i < translates.size (); i++) elems[i]->translate_axis (translates[i] - v.center (), a); } @@ -143,52 +146,44 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a) align_to_fixed_distance (). */ -void -Align_interface::align_elements_to_extents (Grob *me, Axis a) +vector +Align_interface::get_extents_aligned_translates (Grob *me, + vector const &all_grobs, + Axis a, + bool pure, int start, int end) { - Real extra_space = 0.0; Spanner *me_spanner = dynamic_cast (me); - if (a == Y_AXIS - && me_spanner) + + + SCM line_break_details = SCM_EOL; + if (a == Y_AXIS && me_spanner) { -#if 0 - /* - TODO: messes up for figured bass alignments. - */ - if (me_spanner->get_bound (LEFT)->break_status_dir () == CENTER) - me->warning (_ ("vertical alignment called before line-breaking. " - "Only do cross-staff spanners with PianoStaff.")); -#endif + line_break_details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); - SCM details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); - SCM extra_space_handle = scm_assoc (ly_symbol2scm ("alignment-extra-space"), details); + if (!me->get_system () && !pure) + me->warning (_ ("vertical alignment called before line-breaking.\n" + "Only do cross-staff spanners with PianoStaff.")); - extra_space = robust_scm2double (scm_is_pair (extra_space_handle) - ? scm_cdr (extra_space_handle) - : SCM_EOL, - extra_space); } Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), - DOWN); + DOWN); Interval threshold = robust_scm2interval (me->get_property ("threshold"), Interval (0, Interval::infinity ())); - Array dims; - - Link_array elems; + vector dims; + vector elems; - extract_grob_set (me, "elements", all_grobs); - for (int i = 0; i < all_grobs.size (); i++) + for (vsize i = 0; i < all_grobs.size (); i++) { - Interval y = all_grobs[i]->extent (me, a); + Interval y = all_grobs[i]->maybe_pure_extent (all_grobs[i], a, pure, start, end); if (!y.is_empty ()) { Grob *e = dynamic_cast (all_grobs[i]); - elems.push (e); - dims.push (y); + elems.push_back (e); + dims.push_back (y); } } @@ -202,11 +197,20 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a) ? me->get_property ("self-alignment-X") : me->get_property ("self-alignment-Y")); - Array translates; Interval total; Real where = 0; + Real extra_space = 0.0; + SCM extra_space_handle = scm_assq (ly_symbol2scm ("alignment-extra-space"), line_break_details); + + extra_space = robust_scm2double (scm_is_pair (extra_space_handle) + ? scm_cdr (extra_space_handle) + : SCM_EOL, + extra_space); - for (int j = 0; j < elems.size (); j++) + Real padding = robust_scm2double (me->get_property ("padding"), + 0.0); + vector translates; + for (vsize j = 0; j < elems.size (); j++) { Real dy = -dims[j][-stacking_dir]; if (j) @@ -219,41 +223,98 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a) if (j) dy = min (max (dy, threshold[SMALLER]), threshold[BIGGER]); - where += stacking_dir * (dy + extra_space / elems.size ()); + + where += stacking_dir * (dy + padding + extra_space / elems.size ()); total.unite (dims[j] + where); - translates.push (where); + translates.push_back (where); + } + + SCM offsets_handle = scm_assq (ly_symbol2scm ("alignment-offsets"), + line_break_details); + if (scm_is_pair (offsets_handle)) + { + vsize i = 0; + + for (SCM s = scm_cdr (offsets_handle); + scm_is_pair (s) && i < translates.size (); s = scm_cdr (s), i++) + { + if (scm_is_number (scm_car (s))) + translates[i] = scm_to_double (scm_car (s)); + } } + Real center_offset = 0.0; /* also move the grobs that were empty, to maintain spatial order. */ - Array all_translates; + vector all_translates; if (translates.size ()) { - int i = 0; - int j = 0; Real w = translates[0]; - while (j < all_grobs.size ()) + + if (scm_is_number (align)) + center_offset = total.linear_combination (scm_to_double (align)); + + for (vsize i = 0, j = 0; j < all_grobs.size (); j++) { if (i < elems.size () && all_grobs[j] == elems[i]) w = translates[i++]; - all_translates.push (w); - j++; + all_translates.push_back (w - center_offset); } + } + return all_translates; +} - /* - FIXME: uncommenting freaks out the Y-alignment of - line-of-score. - */ - if (scm_is_number (align)) - center_offset = total.linear_combination (scm_to_double (align)); +void +Align_interface::align_elements_to_extents (Grob *me, Axis a) +{ + extract_grob_set (me, "elements", all_grobs); + + vector translates = get_extents_aligned_translates (me, all_grobs, a, false, 0, 0); + if (translates.size ()) + for (vsize j = 0; j < all_grobs.size (); j++) + all_grobs[j]->translate_axis (translates[j], a); +} + +Real +Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end) +{ + extract_grob_set (me, "elements", all_grobs); + SCM dy_scm = me->get_property ("forced-distance"); + + if (scm_is_number (dy_scm)) + { + Real dy = scm_to_double (dy_scm) * robust_scm2dir (me->get_property ("stacking-dir"), DOWN); + Real pos = 0; + for (vsize i = 0; i < all_grobs.size (); i++) + { + if (all_grobs[i] == ch) + return pos; + if (!Hara_kiri_group_spanner::has_interface (all_grobs[i]) + || !Hara_kiri_group_spanner::request_suicide (all_grobs[i], start, end)) + pos += dy; + } + } + else + { + vector translates = get_extents_aligned_translates (me, all_grobs, Y_AXIS, true, start, end); - for (int j = 0; j < all_grobs.size (); j++) - all_grobs[j]->translate_axis (all_translates[j] - center_offset, a); + if (translates.size ()) + { + for (vsize i = 0; i < all_grobs.size (); i++) + if (all_grobs[i] == ch) + return translates[i]; + } + else + return 0; } + + programming_error (_ ("tried to get a translation for something that isn't my child")); + return 0; } + Axis Align_interface::axis (Grob *me) { @@ -263,8 +324,11 @@ Align_interface::axis (Grob *me) void Align_interface::add_element (Grob *me, Grob *element) { - element->add_offset_callback (Grob::same_axis_parent_positioning_proc, - Align_interface::axis (me)); + Axis a = Align_interface::axis (me); + SCM sym = axis_offset_symbol (a); + SCM proc = axis_parent_positioning (a); + + element->set_property (sym, proc); Axis_group_interface::add_element (me, element); } @@ -316,12 +380,15 @@ ADD_INTERFACE (Align_interface, /* properties */ + "align-dir " + "axes " + "elements " "forced-distance " + "padding " + "positioning-done " "stacking-dir " - "align-dir " "threshold " - "positioning-done " - "elements axes"); + ); struct Foobar {