X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=1523ac676602d078a07b17533d35d632b61eb080;hb=93d4b870dbcd205aad7618619dac0aee6f3faf94;hp=0094a018ed9083f2c223d96921d04ccd03bb39c4;hpb=4ef78bcae9cb502769f3ff7051b92381b9093e9f;p=lilypond.git diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 0094a018ed..1523ac6766 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -3,78 +3,166 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2007 Jan Nieuwenhuizen + Han-Wen Nienhuys */ -#include "axis-group-interface.hh" #include "hara-kiri-group-spanner.hh" -#include "debug.hh" -#include "item.hh" -/* - */ -Hara_kiri_group_spanner::Hara_kiri_group_spanner(SCM s) - : Spanner (s) +#include "paper-column.hh" +#include "pointer-group-interface.hh" +#include "axis-group-interface.hh" +#include "spanner.hh" +#include "warn.hh" + +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 1); +SCM +Hara_kiri_group_spanner::y_extent (SCM smob) { - set_elt_pointer ("items-worth-living", SCM_EOL); + Grob *me = unsmob_grob (smob); + consider_suicide (me); + return Axis_group_interface::generic_group_extent (me, Y_AXIS); } -void -Hara_kiri_group_spanner::add_interesting_item (Item* n) +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, calc_skylines, 1); +SCM +Hara_kiri_group_spanner::calc_skylines (SCM smob) { - add_dependency (n); - Pointer_group_interface (this, "items-worth-living").add_element (n); + Grob *me = unsmob_grob (smob); + consider_suicide (me); + return Axis_group_interface::calc_skylines (smob); +} +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, pure_height, 3); +SCM +Hara_kiri_group_spanner::pure_height (SCM smob, SCM start_scm, SCM end_scm) +{ + Grob *me = unsmob_grob (smob); + int start = robust_scm2int (start_scm, 0); + int end = robust_scm2int (end_scm, INT_MAX); + + if (request_suicide (me, start, end)) + return ly_interval2scm (Interval ()); + + return ly_interval2scm (Axis_group_interface::pure_group_height (me, start, end)); } -GLUE_SCORE_ELEMENT(Hara_kiri_group_spanner,after_line_breaking); -SCM -Hara_kiri_group_spanner::member_after_line_breaking () +/* there is probably a way that doesn't involve re-implementing a binary + search (I would love some proper closures right now) */ +bool find_in_range (SCM vector, int low, int hi, int min, int max) { - SCM worth = get_elt_pointer ("items-worth-living"); - /* - worth == self_scm is a stupid way to signal that we're done. - */ - if (gh_pair_p (worth)) - return SCM_UNDEFINED; + if (low >= hi) + return false; + + int mid = low + (hi - low) / 2; + int val = scm_to_int (scm_c_vector_ref (vector, mid)); + if (val >= min && val <= max) + return true; + else if (val < min) + return find_in_range (vector, mid+1, hi, min, max); + return find_in_range (vector, low, mid, min, max); +} - Link_array childs = Axis_group_interface (this).get_children (); - for (int i = 0; i < childs.size (); i++) - { - Score_element* s = childs[i]; +bool +Hara_kiri_group_spanner::request_suicide (Grob *me, int start, int end) +{ + if (!to_boolean (me->get_property ("remove-empty"))) + return false; + + bool remove_first = to_boolean (me->get_property ("remove-first")); + if (!remove_first && start <= 0) + return false; - if ( line_l () != s->line_l ()) - programming_error ("Killing other children too"); - s->suicide (); + SCM important = me->get_property ("important-column-ranks"); + if (scm_is_vector (important)) + { + int len = scm_c_vector_length (important); + if (find_in_range (important, 0, len, start, end)) + return false; + } + else /* build the important-columns-cache */ + { + extract_grob_set (me, "items-worth-living", worth); + vector ranks; + + for (vsize i = 0; i < worth.size (); i++) + { + Interval_t iv = worth[i]->spanned_rank_interval (); + for (int j = iv[LEFT]; j <= iv[RIGHT]; j++) + ranks.push_back (j); + } + vector_sort (ranks, less ()); + uniq (ranks); + + SCM scm_vec = scm_c_make_vector (ranks.size (), SCM_EOL); + for (vsize i = 0; i < ranks.size (); i++) + scm_vector_set_x (scm_vec, scm_from_int (i), scm_from_int (ranks[i])); + me->set_property ("important-column-ranks", scm_vec); + + return request_suicide (me, start, end); } - /* - very appropriate name here :-) - */ - suicide (); - return SCM_UNDEFINED; + return true; } +void +Hara_kiri_group_spanner::consider_suicide (Grob *me) +{ + Spanner *sp = dynamic_cast (me); + int left = sp->get_bound (LEFT)->get_column ()->get_rank (); + int right = sp->get_bound (RIGHT)->get_column ()->get_rank (); + if (!request_suicide (me, left, right)) + return; + vector childs; + Axis_group_interface::get_children (me, &childs); + for (vsize i = 0; i < childs.size (); i++) + childs[i]->suicide (); + + /* + very appropriate name here :-) + */ + me->suicide (); +} /* We can't rely on offsets and dimensions of elements in a hara-kiri group. Use a callback to make sure that hara-kiri has been done before asking for offsets. */ -Real -Hara_kiri_group_spanner::force_hara_kiri_callback (Score_element const *elt, Axis a) +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 1); +SCM +Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob) { - while (elt && !dynamic_cast (elt)) - elt = elt->parent_l(a); - - if (elt) - { - Hara_kiri_group_spanner const * seppuku = dynamic_cast (elt); + Grob *me = unsmob_grob (smob); + consider_suicide (me); + return scm_from_double (0.0); +} - ((Hara_kiri_group_spanner*)seppuku)->member_after_line_breaking (); - } - +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_y_parent_callback, 1); +SCM +Hara_kiri_group_spanner::force_hara_kiri_in_y_parent_callback (SCM smob) +{ + Grob *daughter = unsmob_grob (smob); + force_hara_kiri_callback (daughter->get_parent (Y_AXIS)->self_scm ()); + return scm_from_double (0.0); +} - return 0.0; +void +Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n) +{ + Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("items-worth-living"), n); } + +ADD_INTERFACE (Hara_kiri_group_spanner, + "A group spanner that keeps track of interesting items. If it" + " doesn't contain any after line breaking, it removes itself" + " and all its children.", + + /* properties */ + "items-worth-living " + "important-column-ranks " + "remove-empty " + "remove-first " + ); + +