From a1c2a3a778efafbb8abbd44eb212a3f52f34c5f9 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sun, 20 Jun 2010 08:07:07 +0300 Subject: [PATCH] Don't let lyrics interfere with StaffGrouper. Only return spaceable grobs in get_maybe_pure_last_grob. --- lily/staff-grouper-interface.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lily/staff-grouper-interface.cc b/lily/staff-grouper-interface.cc index 7366190524..9a5d93da25 100644 --- a/lily/staff-grouper-interface.cc +++ b/lily/staff-grouper-interface.cc @@ -20,6 +20,7 @@ #include "staff-grouper-interface.hh" #include "hara-kiri-group-spanner.hh" +#include "page-layout-problem.hh" #include "pointer-group-interface.hh" Grob* @@ -27,8 +28,9 @@ Staff_grouper_interface::get_maybe_pure_last_grob (Grob *me, bool pure, int star { extract_grob_set (me, "elements", elts); for (vsize i = elts.size (); i--;) - if ((pure && !Hara_kiri_group_spanner::request_suicide (me, start, end)) - || (!pure && elts[i]->is_live ())) + if (Page_layout_problem::is_spaceable (elts[i]) + && ((pure && !Hara_kiri_group_spanner::request_suicide (me, start, end)) + || (!pure && elts[i]->is_live ()))) return elts[i]; return 0; -- 2.39.2