X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=520d024516a5f350eee316028114e2684f61ab90;hb=c9f2e5f23fd435ab69b4313a2e5902556cc91511;hp=f4b652c6e2affb7e5bc0b7befa3e5a480dc97bae;hpb=626658181e8fbcdbac2e5d32534f75c23a11dc38;p=lilypond.git diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index f4b652c6e2..520d024516 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2010 Han-Wen Nienhuys + Copyright (C) 2000--2011 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,6 +35,9 @@ #include "system.hh" #include "warn.hh" +static bool +pure_staff_priority_less (Grob *const &g1, Grob *const &g2); + void Axis_group_interface::add_element (Grob *me, Grob *e) { @@ -87,7 +90,7 @@ Axis_group_interface::relative_group_extent (vector const &elts, } Interval -Axis_group_interface::cached_pure_height (Grob *me, int start, int end) +Axis_group_interface::sum_partial_pure_heights (Grob *me, int start, int end) { Interval iv = begin_of_line_pure_height (me, start); iv.unite (rest_of_line_pure_height (me, start, end)); @@ -96,27 +99,47 @@ Axis_group_interface::cached_pure_height (Grob *me, int start, int end) } Interval -Axis_group_interface::rest_of_line_pure_height (Grob *me, int start, int end) +Axis_group_interface::part_of_line_pure_height (Grob *me, bool begin, int start, int end) { + Spanner *sp = dynamic_cast (me); + SCM cache_symbol = begin + ? ly_symbol2scm ("begin-of-line-pure-height") + : ly_symbol2scm ("rest-of-line-pure-height"); + SCM cached = sp->get_cached_pure_property (cache_symbol, start, end); + if (scm_is_pair (cached)) + return robust_scm2interval (cached, Interval (0, 0)); + SCM adjacent_pure_heights = me->get_property ("adjacent-pure-heights"); + Interval ret; + + if (!scm_is_pair (adjacent_pure_heights)) + ret = Interval (0, 0); + else + { + SCM these_pure_heights = begin + ? scm_car (adjacent_pure_heights) + : scm_cdr (adjacent_pure_heights); - if (!scm_is_pair (adjacent_pure_heights) - || !scm_is_vector (scm_cdr (adjacent_pure_heights))) - return Interval (0, 0); + if (scm_is_vector (these_pure_heights)) + ret = combine_pure_heights (me, these_pure_heights, start, end); + else + ret = Interval (0, 0); + } - return combine_pure_heights (me, scm_cdr (adjacent_pure_heights), start, end); + sp->cache_pure_property (cache_symbol, start, end, ly_interval2scm (ret)); + return ret; } Interval Axis_group_interface::begin_of_line_pure_height (Grob *me, int start) { - SCM adjacent_pure_heights = me->get_property ("adjacent-pure-heights"); - - if (!scm_is_pair (adjacent_pure_heights) - || !scm_is_vector (scm_car (adjacent_pure_heights))) - return Interval (0, 0); + return part_of_line_pure_height (me, true, start, start + 1); +} - return combine_pure_heights (me, scm_car (adjacent_pure_heights), start, start+1); +Interval +Axis_group_interface::rest_of_line_pure_height (Grob *me, int start, int end) +{ + return part_of_line_pure_height (me, false, start, end); } Interval @@ -146,7 +169,6 @@ Axis_group_interface::combine_pure_heights (Grob *me, SCM measure_extents, int s // is at the beginning of a line. The second vector stores, for each measure, // the combined height of the elements that are present only when the bar // is not at the beginning of a line. - MAKE_SCHEME_CALLBACK (Axis_group_interface, adjacent_pure_heights, 1) SCM Axis_group_interface::adjacent_pure_heights (SCM smob) @@ -154,73 +176,95 @@ Axis_group_interface::adjacent_pure_heights (SCM smob) Grob *me = unsmob_grob (smob); Grob *common = unsmob_grob (me->get_object ("pure-Y-common")); - extract_grob_set (me, "pure-relevant-items", items); - extract_grob_set (me, "pure-relevant-spanners", spanners); + extract_grob_set (me, "pure-relevant-grobs", elts); Paper_score *ps = get_root_system (me)->paper_score (); - vector breaks = ps->get_break_indices (); - vector cols = ps->get_columns (); + vector ranks = ps->get_break_ranks (); - SCM begin_line_heights = scm_c_make_vector (breaks.size () - 1, SCM_EOL); - SCM mid_line_heights = scm_c_make_vector (breaks.size () - 1, SCM_EOL); + vector begin_line_heights; + vector mid_line_heights; + vector begin_line_staff_heights; + vector mid_line_staff_heights; + begin_line_heights.resize (ranks.size () - 1); + mid_line_heights.resize (ranks.size () - 1); - vsize it_index = 0; - for (vsize i = 0; i + 1 < breaks.size (); i++) + for (vsize i = 0; i < elts.size (); ++i) { - int start = Paper_column::get_rank (cols[breaks[i]]); - int end = Paper_column::get_rank (cols[breaks[i+1]]); + Grob *g = elts[i]; - // Take grobs that are visible with respect to a slightly longer line. - // Otherwise, we will never include grobs at breakpoints which aren't - // end-of-line-visible. - int visibility_end = i + 2 < breaks.size () ? - Paper_column::get_rank (cols[breaks[i+2]]) : end; + if (to_boolean (g->get_property ("cross-staff"))) + continue; - Interval begin_line_iv; - Interval mid_line_iv; + bool outside_staff = scm_is_number (g->get_property ("outside-staff-priority")); + Real padding = robust_scm2double (g->get_property ("outside-staff-padding"), 0.5); - for (vsize j = it_index; j < items.size (); j++) + // When we encounter the first outside-staff grob, make a copy + // of the current heights to use as an estimate for the staff heights. + // Note that the outside-staff approximation that we use here doesn't + // consider any collisions that might occur between outside-staff grobs, + // but only the fact that outside-staff grobs may need to be raised above + // the staff. + if (outside_staff && begin_line_staff_heights.empty ()) { - Item *it = dynamic_cast (items[j]); - int rank = it->get_column ()->get_rank (); - - if (rank <= end && it->pure_is_visible (start, visibility_end) - && !to_boolean (it->get_property ("cross-staff"))) - { - Interval dims = items[j]->pure_height (common, start, end); - Interval &target_iv = start == it->get_column ()->get_rank () ? begin_line_iv : mid_line_iv; + begin_line_staff_heights = begin_line_heights; + mid_line_staff_heights = mid_line_heights; + } - if (!dims.is_empty ()) - target_iv.unite (dims); - } + // TODO: consider a pure version of get_grob_direction? + Direction d = to_dir (g->get_property_data ("direction")); + d = (d == CENTER) ? UP : d; - if (rank < end) - it_index++; - else if (rank > end) - break; - } + Interval_t rank_span = g->spanned_rank_interval (); + vsize first_break = lower_bound (ranks, (vsize)rank_span[LEFT], less ()); + if (first_break > 0 && ranks[first_break] >= (vsize)rank_span[LEFT]) + first_break--; - for (vsize j = 0; j < spanners.size (); j++) + for (vsize j = first_break; j+1 < ranks.size () && (int)ranks[j] <= rank_span[RIGHT]; ++j) { - Interval_t rank_span = spanners[j]->spanned_rank_interval (); - if (rank_span[LEFT] <= end && rank_span[RIGHT] >= start - && !to_boolean (spanners[j]->get_property ("cross-staff"))) - { - Interval dims = spanners[j]->pure_height (common, start, end); + int start = ranks[j]; + int end = ranks[j+1]; + + // Take grobs that are visible with respect to a slightly longer line. + // Otherwise, we will never include grobs at breakpoints which aren't + // end-of-line-visible. + int visibility_end = j + 2 < ranks.size () ? ranks[j+2] : end; + if (g->pure_is_visible (start, visibility_end)) + { + Interval dims = g->pure_height (common, start, end); if (!dims.is_empty ()) { - mid_line_iv.unite (dims); if (rank_span[LEFT] <= start) - begin_line_iv.unite (dims); + { + if (outside_staff) + begin_line_heights[j].unite ( + begin_line_staff_heights[j].union_disjoint (dims, padding, d)); + else + begin_line_heights[j].unite (dims); + } + if (rank_span[RIGHT] > start) + { + if (outside_staff) + mid_line_heights[j].unite ( + mid_line_staff_heights[j].union_disjoint (dims, padding, d)); + else + mid_line_heights[j].unite (dims); + } } } } + } - scm_vector_set_x (begin_line_heights, scm_from_int (i), ly_interval2scm (begin_line_iv)); - scm_vector_set_x (mid_line_heights, scm_from_int (i), ly_interval2scm (mid_line_iv)); + // Convert begin_line_heights and min_line_heights to SCM. + SCM begin_scm = scm_c_make_vector (ranks.size () - 1, SCM_EOL); + SCM mid_scm = scm_c_make_vector (ranks.size () - 1, SCM_EOL); + for (vsize i = 0; i < begin_line_heights.size (); ++i) + { + scm_vector_set_x (begin_scm, scm_from_int (i), ly_interval2scm (begin_line_heights[i])); + scm_vector_set_x (mid_scm, scm_from_int (i), ly_interval2scm (mid_line_heights[i])); } - return scm_cons (begin_line_heights, mid_line_heights); + + return scm_cons (begin_scm, mid_scm); } Interval @@ -231,43 +275,26 @@ Axis_group_interface::relative_pure_height (Grob *me, int start, int end) 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 + Usually, 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 (p && Align_interface::has_interface (p)) - return Axis_group_interface::cached_pure_height (me, start, end); + return Axis_group_interface::sum_partial_pure_heights (me, start, end); Grob *common = unsmob_grob (me->get_object ("pure-Y-common")); - extract_grob_set (me, "pure-relevant-items", items); - extract_grob_set (me, "pure-relevant-spanners", spanners); + extract_grob_set (me, "pure-relevant-grobs", elts); Interval r; - - for (vsize i = 0; i < items.size (); i++) - { - Item *it = dynamic_cast (items[i]); - int rank = it->get_column ()->get_rank (); - - if (rank > end) - break; - else if (rank >= start && it->pure_is_visible (start, end) - && !to_boolean (it->get_property ("cross-staff"))) - { - Interval dims = it->pure_height (common, start, end); - if (!dims.is_empty ()) - r.unite (dims); - } - } - - for (vsize i = 0; i < spanners.size (); i++) + for (vsize i = 0; i < elts.size (); i++) { - Interval_t rank_span = spanners[i]->spanned_rank_interval (); + Grob *g = elts[i]; + Interval_t rank_span = g->spanned_rank_interval (); if (rank_span[LEFT] <= end && rank_span[RIGHT] >= start - && !to_boolean (spanners[i]->get_property ("cross-staff"))) + && g->pure_is_visible (start, end) + && !to_boolean (g->get_property ("cross-staff"))) { - Interval dims = spanners[i]->pure_height (common, start, end); + Interval dims = g->pure_height (common, start, end); if (!dims.is_empty ()) r.unite (dims); } @@ -357,7 +384,7 @@ Axis_group_interface::combine_skylines (SCM smob) } return ret.smobbed_copy (); } - + SCM Axis_group_interface::generic_group_extent (Grob *me, Axis a) { @@ -396,7 +423,7 @@ SCM Axis_group_interface::calc_pure_relevant_grobs (SCM smob) { Grob *me = unsmob_grob (smob); - + extract_grob_set (me, "elements", elts); vector relevant_grobs; @@ -420,50 +447,13 @@ Axis_group_interface::calc_pure_relevant_grobs (SCM smob) } } + vector_sort (relevant_grobs, pure_staff_priority_less); SCM grobs_scm = Grob_array::make_array (); unsmob_grob_array (grobs_scm)->set_array (relevant_grobs); return grobs_scm; } -MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_relevant_items, 1); -SCM -Axis_group_interface::calc_pure_relevant_items (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - extract_grob_set (me, "pure-relevant-grobs", elts); - - vector relevant_items; - for (vsize i = 0; i < elts.size (); i++) - if (Item *it = dynamic_cast (elts[i])) - relevant_items.push_back (it); - - vector_sort (relevant_items, Item::less); - - SCM items_scm = Grob_array::make_array (); - unsmob_grob_array (items_scm)->set_array (relevant_items); - return items_scm; -} - -MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_relevant_spanners, 1); -SCM -Axis_group_interface::calc_pure_relevant_spanners (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - extract_grob_set (me, "pure-relevant-grobs", elts); - - vector relevant_spanners; - for (vsize i = 0; i < elts.size (); i++) - if (dynamic_cast (elts[i])) - relevant_spanners.push_back (elts[i]); - - SCM spanners_scm = Grob_array::make_array (); - unsmob_grob_array (spanners_scm)->set_array (relevant_spanners); - return spanners_scm; -} - MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_y_common, 1); SCM Axis_group_interface::calc_pure_y_common (SCM smob) @@ -542,7 +532,7 @@ Axis_group_interface::get_children (Grob *me, vector *found) } } -bool +static bool staff_priority_less (Grob * const &g1, Grob * const &g2) { Real priority_1 = robust_scm2double (g1->get_property ("outside-staff-priority"), -infinity_f); @@ -566,6 +556,15 @@ staff_priority_less (Grob * const &g1, Grob * const &g2) return start_1 < start_2; } +static bool +pure_staff_priority_less (Grob * const &g1, Grob * const &g2) +{ + 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); + + return priority_1 < priority_2; +} + static void add_boxes (Grob *me, Grob *x_common, Grob *y_common, vector *const boxes, Skyline_pair *skylines) { @@ -714,7 +713,7 @@ Axis_group_interface::skyline_spacing (Grob *me, vector elements) SCM priority = elements[i]->get_property ("outside-staff-priority"); vector current_elts; current_elts.push_back (elements[i]); - while (i + 1 < elements.size () + while (i + 1 < elements.size () && scm_eq_p (elements[i+1]->get_property ("outside-staff-priority"), priority)) { if (!to_boolean (elements[i+1]->get_property ("cross-staff"))) @@ -747,28 +746,28 @@ Axis_group_interface::print (SCM smob) return ret.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_next_staff_spacing, 3) +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_staff_staff_spacing, 3) SCM -Axis_group_interface::calc_pure_next_staff_spacing (SCM smob, SCM start, SCM end) +Axis_group_interface::calc_pure_staff_staff_spacing (SCM smob, SCM start, SCM end) { - return calc_maybe_pure_next_staff_spacing (unsmob_grob (smob), - true, - scm_to_int (start), - scm_to_int (end)); + return calc_maybe_pure_staff_staff_spacing (unsmob_grob (smob), + true, + scm_to_int (start), + scm_to_int (end)); } -MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_next_staff_spacing, 1) +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_staff_staff_spacing, 1) SCM -Axis_group_interface::calc_next_staff_spacing (SCM smob) +Axis_group_interface::calc_staff_staff_spacing (SCM smob) { - return calc_maybe_pure_next_staff_spacing (unsmob_grob (smob), - false, - 0, - INT_MAX); + return calc_maybe_pure_staff_staff_spacing (unsmob_grob (smob), + false, + 0, + INT_MAX); } SCM -Axis_group_interface::calc_maybe_pure_next_staff_spacing (Grob *me, bool pure, int start, int end) +Axis_group_interface::calc_maybe_pure_staff_staff_spacing (Grob *me, bool pure, int start, int end) { Grob *grouper = unsmob_grob (me->get_object ("staff-grouper")); @@ -776,11 +775,11 @@ Axis_group_interface::calc_maybe_pure_next_staff_spacing (Grob *me, bool pure, i { Grob *last_in_group = Staff_grouper_interface::get_maybe_pure_last_grob (grouper, pure, start, end); if (me == last_in_group) - return grouper->get_maybe_pure_property ("after-last-staff-spacing", pure, start, end); + return grouper->get_maybe_pure_property ("staffgroup-staff-spacing", pure, start, end); else - return grouper->get_maybe_pure_property ("between-staff-spacing", pure, start, end); + return grouper->get_maybe_pure_property ("staff-staff-spacing", pure, start, end); } - return me->get_maybe_pure_property ("default-next-staff-spacing", pure, start, end); + return me->get_maybe_pure_property ("default-staff-staff-spacing", pure, start, end); } Real @@ -802,24 +801,24 @@ ADD_INTERFACE (Axis_group_interface, // VerticalAxisGroup. We should split off a // vertical-axis-group-interface. /* properties */ - "X-common " - "Y-common " "adjacent-pure-heights " "axes " - "default-next-staff-spacing " + "default-staff-staff-spacing " "elements " - "inter-loose-line-spacing " - "inter-staff-spacing " "max-stretch " - "non-affinity-spacing " - "next-staff-spacing " "no-alignment " - "pure-Y-common " + "nonstaff-nonstaff-spacing " + "nonstaff-relatedstaff-spacing " + "nonstaff-unrelatedstaff-spacing " "pure-relevant-grobs " "pure-relevant-items " "pure-relevant-spanners " + "pure-Y-common " "staff-affinity " "staff-grouper " + "staff-staff-spacing " "system-Y-offset " "vertical-skylines " + "X-common " + "Y-common " );