X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=1d509f04d1923b436c0f4866d2767e2b085fea32;hb=73b1239c26cd8f25d34ed9595967caa99932d784;hp=11b00e97c8d0aee81f8df56b4d6259901dc728a5;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 11b00e97c8..1d509f04d1 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -3,14 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (c) 2000--2006 Han-Wen Nienhuys */ #include "axis-group-interface.hh" +#include "align-interface.hh" #include "pointer-group-interface.hh" #include "grob.hh" +#include "grob-array.hh" #include "hara-kiri-group-spanner.hh" +#include "international.hh" +#include "item.hh" +#include "paper-column.hh" +#include "paper-score.hh" +#include "system.hh" #include "warn.hh" void @@ -19,7 +26,7 @@ Axis_group_interface::add_element (Grob *me, Grob *e) SCM axes = me->get_property ("axes"); if (!scm_is_pair (axes)) programming_error ("axes should be nonempty"); - + for (SCM ax = axes; ax != SCM_EOL; ax = scm_cdr (ax)) { Axis a = (Axis) scm_to_int (scm_car (ax)); @@ -29,29 +36,29 @@ Axis_group_interface::add_element (Grob *me, Grob *e) e->internal_set_object ((a == X_AXIS) ? ly_symbol2scm ("axis-group-parent-X") - : ly_symbol2scm ("axis-group-parent-Y"), + : ly_symbol2scm ("axis-group-parent-Y"), me->self_scm ()); } + /* must be ordered, because Align_interface also uses + Axis_group_interface */ Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), e); } bool Axis_group_interface::has_axis (Grob *me, Axis a) { - /* - urg. FIXME, check for Hara_kiri_group_spanner shouldn't be necessary? - */ - return me->has_extent_callback (group_extent_callback_proc, a) - || (me->has_extent_callback (Hara_kiri_group_spanner::y_extent_proc, a)); + SCM axes = me->get_property ("axes"); + + return (SCM_BOOL_F != scm_memq (scm_from_int (a), axes)); } Interval -Axis_group_interface::relative_group_extent (Link_array const &elts, +Axis_group_interface::relative_group_extent (vector const &elts, Grob *common, Axis a) { Interval r; - for (int i = 0; i < elts.size(); i++) + for (vsize i = 0; i < elts.size (); i++) { Grob *se = elts[i]; Interval dims = se->extent (common, a); @@ -61,15 +68,119 @@ Axis_group_interface::relative_group_extent (Link_array const &elts, return r; } +Interval +Axis_group_interface::cached_pure_height (Grob *me, + vector const &elts, + Grob *common, + int start, int end) +{ + Paper_score *ps = get_root_system (me)->paper_score (); + vector breaks = ps->get_break_indices (); + vector cols = ps->get_columns (); + vsize start_index = VPOS; + vsize end_index = VPOS; + + for (vsize i = 0; i < breaks.size (); i++) + { + int r = Paper_column::get_rank (cols[breaks[i]]); + if (start == r) + start_index = i; + if (end == r) + end_index = i; + } + + if (start_index == VPOS || end_index == VPOS) + { + programming_error (_ ("tried to calculate pure-height at a non-breakpoint")); + return Interval (0, 0); + } + + SCM extents = me->get_property ("cached-pure-extents"); + if (!scm_is_vector (extents)) + { + extents = scm_c_make_vector (breaks.size () - 1, SCM_EOL); + for (vsize i = 0; i < breaks.size () - 1; i++) + { + int st = Paper_column::get_rank (cols[breaks[i]]); + int ed = Paper_column::get_rank (cols[breaks[i+1]]); + Interval iv = relative_pure_height (me, elts, common, st, ed, false); + scm_vector_set_x (extents, scm_from_int (i), ly_interval2scm (iv)); + } + me->set_property ("cached-pure-extents", extents); + } + + Interval ext (0, 0); + for (vsize i = start_index; i < end_index; i++) + ext.unite (ly_scm2interval (scm_c_vector_ref (extents, i))); + return ext; +} + +Interval +Axis_group_interface::relative_pure_height (Grob *me, + vector const &elts, + Grob *common, + int start, int end, + bool use_cache) +{ + /* It saves a _lot_ of time if we assume a VerticalAxisGroup is additive + (ie. height (i, k) = height (i, j) + height (j, k) for all i <= j <= k). + Unfortunately, it isn't always true, particularly if there is a + VerticalAlignment somewhere in the descendants. + + Apart from PianoStaff, which has a fixed VerticalAlignment so it doesn't + count, the only VerticalAlignment comes from Score. This makes it + reasonably safe to assume that if our parent is a VerticalAlignment, + we can assume additivity and cache things nicely. */ + Grob *p = me->get_parent (Y_AXIS); + if (use_cache && p && Align_interface::has_interface (p)) + return Axis_group_interface::cached_pure_height (me, elts, common, start, end); + + Interval r; + + for (vsize i = 0; i < elts.size (); i++) + { + Interval_t rank_span = elts[i]->spanned_rank_iv (); + Item *it = dynamic_cast (elts[i]); + if (rank_span[LEFT] <= end && rank_span[RIGHT] >= start && (!it || it->pure_is_visible (start, end))) + { + Interval dims = elts[i]->pure_height (common, start, end); + if (!dims.is_empty ()) + r.unite (dims); + } + } + return r; +} + +MAKE_SCHEME_CALLBACK (Axis_group_interface, width, 1); +SCM +Axis_group_interface::width (SCM smob) +{ + Grob *me = unsmob_grob (smob); + return generic_group_extent (me, X_AXIS); +} +MAKE_SCHEME_CALLBACK (Axis_group_interface, height, 1); +SCM +Axis_group_interface::height (SCM smob) +{ + Grob *me = unsmob_grob (smob); + return generic_group_extent (me, Y_AXIS); +} -MAKE_SCHEME_CALLBACK (Axis_group_interface, group_extent_callback, 2); +MAKE_SCHEME_CALLBACK (Axis_group_interface, pure_height, 3); SCM -Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis) +Axis_group_interface::pure_height (SCM smob, SCM start_scm, SCM end_scm) { - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (scm_axis); + int start = robust_scm2int (start_scm, 0); + int end = robust_scm2int (end_scm, INT_MAX); + Grob *me = unsmob_grob (smob); + return pure_group_height (me, start, end); +} + +SCM +Axis_group_interface::generic_group_extent (Grob *me, Axis a) +{ extract_grob_set (me, "elements", elts); Grob *common = common_refpoint_of_array (elts, me, a); @@ -79,48 +190,61 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis) return ly_interval2scm (r - my_coord); } -void -Axis_group_interface::set_axes (Grob *me, Axis a1, Axis a2) +SCM +Axis_group_interface::pure_group_height (Grob *me, int start, int end) { - SCM sa1 = scm_int2num (a1); - SCM sa2 = scm_int2num (a2); - - SCM axes = me->get_property ("axes"); + Grob *common = unsmob_grob (me->get_object ("common-refpoint-of-elements")); - if (!scm_is_pair (axes) - || scm_c_memq (sa1, axes) == SCM_BOOL_F - || scm_c_memq (sa2, axes) == SCM_BOOL_F) + if (!common) { - SCM ax = scm_cons (sa1, SCM_EOL); - if (a1 != a2) - ax = scm_cons (sa2, ax); - me->set_property ("axes", ax); + extract_grob_set (me, "elements", elts); + + vector relevant_elts; + SCM is_relevant = ly_lily_module_constant ("pure-relevant"); + + 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); + } + + common = common_refpoint_of_array (relevant_elts, me, Y_AXIS); + me->set_object ("common-refpoint-of-elements", 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); } - if (a1 != X_AXIS && a2 != X_AXIS) - me->set_extent (SCM_EOL, X_AXIS); - if (a1 != Y_AXIS && a2 != Y_AXIS) - me->set_extent (SCM_EOL, Y_AXIS); - - /* - why so convoluted ? (fixme/documentme?) - */ - if (me->has_extent_callback (Grob::stencil_extent_proc, a1)) - me->set_extent_callback (Axis_group_interface::group_extent_callback_proc, a1); - if (me->has_extent_callback (Grob::stencil_extent_proc, a2)) - me->set_extent_callback (Axis_group_interface::group_extent_callback_proc, a2); + 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)); + + return ly_interval2scm (r - my_coord); } void -Axis_group_interface::get_children (Grob *me, Link_array *found) +Axis_group_interface::get_children (Grob *me, vector *found) { - found->push (me); + found->push_back (me); if (!has_interface (me)) return; extract_grob_set (me, "elements", elements); - for (int i = 0; i < elements.size (); i++) + for (vsize i = 0; i < elements.size (); i++) { Grob *e = elements[i]; Axis_group_interface::get_children (e, found); @@ -128,5 +252,13 @@ Axis_group_interface::get_children (Grob *me, Link_array *found) } ADD_INTERFACE (Axis_group_interface, "axis-group-interface", + "An object that groups other layout objects.", - "axes elements"); + + /* properties */ + "axes " + "elements " + "common-refpoint-of-elements " + "pure-relevant-elements " + "cached-pure-extents " + );