X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=1523ac676602d078a07b17533d35d632b61eb080;hb=c6554467b0a9beddf0d7ef12746ae31a25fe36e7;hp=73fe4d6775dc9b9fe16291e3cd0232f9e1f04825;hpb=63a3195112d1e2753e2699442841f3c760b2f705;p=lilypond.git diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 73fe4d6775..1523ac6766 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -43,7 +43,8 @@ Hara_kiri_group_spanner::pure_height (SCM smob, SCM start_scm, SCM end_scm) if (request_suicide (me, start, end)) return ly_interval2scm (Interval ()); - return Axis_group_interface::pure_group_height (me, start, end); + + return ly_interval2scm (Axis_group_interface::pure_group_height (me, start, end)); } /* there is probably a way that doesn't involve re-implementing a binary @@ -86,7 +87,7 @@ Hara_kiri_group_spanner::request_suicide (Grob *me, int start, int end) for (vsize i = 0; i < worth.size (); i++) { - Interval_t iv = worth[i]->spanned_rank_iv (); + Interval_t iv = worth[i]->spanned_rank_interval (); for (int j = iv[LEFT]; j <= iv[RIGHT]; j++) ranks.push_back (j); } @@ -153,10 +154,9 @@ Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n) } ADD_INTERFACE (Hara_kiri_group_spanner, - "A group spanner that keeps track of interesting items. If it " - "doesn't contain any after linebreaking, then it " - "will remove itself and all its children.", - + "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 "