X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=23c30872474d31267c92d093122dd1be452d6a1b;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=9149f667bc42443cee407e82373b8078af67ae64;hpb=8d10ded201408e51e60a5194a8bffdafbb710d85;p=lilypond.git diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 9149f667bc..23c3087247 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2006 Han-Wen Nienhuys + (c) 2000--2007 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -68,6 +68,14 @@ Axis_group_interface::relative_group_extent (vector const &elts, return r; } + +/* + FIXME: pure extent handling has a lot of ad-hoc caching. + This should be done with grob property callbacks. + + --hwn +*/ + Interval Axis_group_interface::cached_pure_height (Grob *me, vector const &elts, @@ -101,7 +109,7 @@ Axis_group_interface::cached_pure_height (Grob *me, if (!scm_is_vector (extents)) { extents = scm_c_make_vector (breaks.size () - 1, SCM_EOL); - for (vsize i = 0; i < breaks.size () - 1; i++) + for (vsize i = 0; i + 1 < breaks.size (); i++) { int st = Paper_column::get_rank (cols[breaks[i]]); int ed = Paper_column::get_rank (cols[breaks[i+1]]); @@ -177,15 +185,67 @@ Axis_group_interface::pure_height (SCM smob, SCM start_scm, SCM end_scm) int end = robust_scm2int (end_scm, INT_MAX); Grob *me = unsmob_grob (smob); + /* Maybe we are in the second pass of a two-pass spacing run. In that + case, the Y-extent of a system is already given to us */ + System *system = dynamic_cast (me); + if (system) + { + SCM line_break_details = system->column (start)->get_property ("line-break-system-details"); + SCM system_y_extent = scm_assq (ly_symbol2scm ("system-Y-extent"), line_break_details); + if (scm_is_pair (system_y_extent)) + return scm_cdr (system_y_extent); + } + return pure_group_height (me, start, end); } + +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_skylines, 1); +SCM +Axis_group_interface::calc_skylines (SCM smob) +{ + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elts); + return skyline_spacing (me, elts).smobbed_copy (); +} + +/* whereas calc_skylines calculates skylines for axis-groups with a lot of + visible children, combine_skylines is designed for axis-groups whose only + children are other axis-groups (ie. VerticalAlignment). Rather than + calculating all the skylines from scratch, we just merge the skylines + of the children. +*/ +MAKE_SCHEME_CALLBACK (Axis_group_interface, combine_skylines, 1); +SCM +Axis_group_interface::combine_skylines (SCM smob) +{ + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elements); + Grob *y_common = common_refpoint_of_array (elements, me, Y_AXIS); + + assert (y_common == me); + + Skyline_pair ret; + for (vsize i = 0; i < elements.size (); i++) + { + SCM skyline_scm = elements[i]->get_property ("skylines"); + if (Skyline_pair::unsmob (skyline_scm)) + { + Real offset = elements[i]->relative_coordinate (y_common, Y_AXIS); + Skyline_pair other = *Skyline_pair::unsmob (skyline_scm); + other.raise (offset); + ret.merge (other); + } + } + return ret.smobbed_copy (); +} SCM Axis_group_interface::generic_group_extent (Grob *me, Axis a) { + /* trigger the callback to do skyline-spacing on the children */ + (void) me->get_property ("skylines"); + extract_grob_set (me, "elements", elts); - if (a == Y_AXIS && to_boolean (me->get_property ("skyline-spacing"))) - skyline_spacing (me, elts); Grob *common = common_refpoint_of_array (elts, me, a); Real my_coord = me->relative_coordinate (common, a); @@ -194,44 +254,73 @@ Axis_group_interface::generic_group_extent (Grob *me, Axis a) return ly_interval2scm (r - my_coord); } -SCM -Axis_group_interface::pure_group_height (Grob *me, int start, int end) + +Grob * +Axis_group_interface::calc_pure_elts_and_common (Grob *me) { - Grob *common = unsmob_grob (me->get_object ("common-refpoint-of-elements")); + if (Grob *c = unsmob_grob (me->get_object ("pure-Y-common"))) + return c; + + extract_grob_set (me, "elements", elts); - if (!common) + vector relevant_elts; + SCM pure_relevant_p = ly_lily_module_constant ("pure-relevant?"); + + for (vsize i = 0; i < elts.size (); i++) { - extract_grob_set (me, "elements", elts); + if (to_boolean (scm_apply_1 (pure_relevant_p, elts[i]->self_scm (), SCM_EOL))) + relevant_elts.push_back (elts[i]); - vector relevant_elts; - SCM is_relevant = ly_lily_module_constant ("pure-relevant"); + Item *it = dynamic_cast (elts[i]); + Direction d = LEFT; + if (it) + do + { + Item *piece = it->find_prebroken_piece (d); + if (piece && to_boolean (scm_apply_1 (pure_relevant_p, piece->self_scm (), SCM_EOL))) + relevant_elts.push_back (piece); + } + while (flip (&d) != LEFT); + } - for (vsize i = 0; i < elts.size (); i++) - { - if (to_boolean (scm_apply_1 (is_relevant, elts[i]->self_scm (), SCM_EOL))) - relevant_elts.push_back (elts[i]); - - Item *it = dynamic_cast (elts[i]); - Direction d = LEFT; - if (it) - do - { - Item *piece = it->find_prebroken_piece (d); - if (piece && to_boolean (scm_apply_1 (is_relevant, piece->self_scm (), SCM_EOL))) - relevant_elts.push_back (piece); - } - while (flip (&d) != LEFT); - } + Grob *common = common_refpoint_of_array (relevant_elts, me, Y_AXIS); + me->set_object ("pure-Y-common", common->self_scm ()); + + SCM ga_scm = Grob_array::make_array (); + Grob_array *ga = unsmob_grob_array (ga_scm); + ga->set_array (relevant_elts); + me->set_object ("pure-relevant-elements", ga_scm); - common = common_refpoint_of_array (relevant_elts, me, Y_AXIS); - me->set_object ("common-refpoint-of-elements", common->self_scm ()); + return common; +} - SCM ga_scm = Grob_array::make_array (); - Grob_array *ga = unsmob_grob_array (ga_scm); - ga->set_array (relevant_elts); - me->set_object ("pure-relevant-elements", ga_scm); - } +MAKE_SCHEME_CALLBACK(Axis_group_interface,calc_x_common, 1); +SCM +Axis_group_interface::calc_x_common (SCM grob) +{ + Grob *me = unsmob_grob (grob); + extract_grob_set (me, "elements", elts); + Grob *common = common_refpoint_of_array (elts, me, X_AXIS); + return common->self_scm (); +} + +MAKE_SCHEME_CALLBACK(Axis_group_interface,calc_y_common, 1); +SCM +Axis_group_interface::calc_y_common (SCM grob) +{ + Grob *me = unsmob_grob (grob); + + extract_grob_set (me, "elements", elts); + Grob *common = common_refpoint_of_array (elts, me, Y_AXIS); + return common->self_scm (); +} + +SCM +Axis_group_interface::pure_group_height (Grob *me, int start, int end) +{ + Grob *common = calc_pure_elts_and_common (me); + extract_grob_set (me, "pure-relevant-elements", elts); Real my_coord = me->relative_coordinate (common, Y_AXIS); Interval r (relative_pure_height (me, elts, common, start, end, true)); @@ -258,8 +347,8 @@ Axis_group_interface::get_children (Grob *me, vector *found) bool staff_priority_less (Grob * const &g1, Grob * const &g2) { - int priority_1 = robust_scm2int (g1->get_property ("outside-staff-priority"), INT_MIN); - int priority_2 = robust_scm2int (g2->get_property ("outside-staff-priority"), INT_MIN); + Real priority_1 = robust_scm2double (g1->get_property ("outside-staff-priority"), -infinity_f); + Real priority_2 = robust_scm2double (g2->get_property ("outside-staff-priority"), -infinity_f); if (priority_1 < priority_2) return true; @@ -307,7 +396,7 @@ add_boxes (Grob *me, Grob *x_common, Grob *y_common, vector *const boxes) edge of the just-placed grob). Otherwise, we skip it until the next pass. */ static void -add_grobs_of_one_priority (Drul_array *const skylines, +add_grobs_of_one_priority (Skyline_pair *const skylines, vector elements, Grob *x_common, Grob *y_common) @@ -354,21 +443,27 @@ add_grobs_of_one_priority (Drul_array *const skylines, elements[i]->translate_axis (dir*dist, Y_AXIS); } (*skylines)[dir].insert (b, 0, X_AXIS); - elements[i]->del_property ("outside-staff-padding"); + elements[i]->set_property ("outside-staff-priority", SCM_BOOL_F); last_affected_position[dir] = b[X_AXIS][RIGHT]; } + + /* + Ugh: quadratic. --hwn + */ elements.erase (elements.begin () + i); } } } -void +Skyline_pair Axis_group_interface::skyline_spacing (Grob *me, vector elements) { vector_sort (elements, staff_priority_less); Grob *x_common = common_refpoint_of_array (elements, me, X_AXIS); Grob *y_common = common_refpoint_of_array (elements, me, Y_AXIS); + assert (y_common == me); + vsize i = 0; vector boxes; @@ -376,19 +471,19 @@ Axis_group_interface::skyline_spacing (Grob *me, vector elements) && !scm_is_number (elements[i]->get_property ("outside-staff-priority")); i++) add_boxes (elements[i], x_common, y_common, &boxes); - Drul_array skylines (Skyline (boxes, 0, X_AXIS, DOWN), - Skyline (boxes, 0, X_AXIS, UP)); + Skyline_pair skylines (boxes, 0, X_AXIS); for (; i < elements.size (); i++) { SCM priority = elements[i]->get_property ("outside-staff-priority"); vector current_elts; current_elts.push_back (elements[i]); - while (i < elements.size () - 1 + while (i + 1 < elements.size () && scm_eq_p (elements[i+1]->get_property ("outside-staff-priority"), priority)) current_elts.push_back (elements[++i]); add_grobs_of_one_priority (&skylines, current_elts, x_common, y_common); } + return skylines; } ADD_INTERFACE (Axis_group_interface, @@ -396,10 +491,12 @@ ADD_INTERFACE (Axis_group_interface, "An object that groups other layout objects.", /* properties */ + "X-common " + "Y-common " "axes " "elements " - "common-refpoint-of-elements " + "pure-Y-common " "pure-relevant-elements " - "skyline-spacing " + "skylines " "cached-pure-extents " );