Update regtest due to changes in page-breaking.

[lilypond.git] / lily / staff-grouper-interface.cc

diff --git a/lily/staff-grouper-interface.cc b/lily/staff-grouper-interface.cc
index e4a3be02ca09bbd268a086e521ba85222b932a47..9a5d93da25a80ac998c82ccbf6a8a3821b86ee67 100644 (file)
--- a/lily/staff-grouper-interface.cc
+++ b/lily/staff-grouper-interface.cc
@@ -19,14 +19,18 @@
 
 #include "staff-grouper-interface.hh"
 
+#include "hara-kiri-group-spanner.hh"
+#include "page-layout-problem.hh"
 #include "pointer-group-interface.hh"
 
 Grob*
-Staff_grouper_interface::get_last_grob (Grob *me)
+Staff_grouper_interface::get_maybe_pure_last_grob (Grob *me, bool pure, int start, int end)
 {
   extract_grob_set (me, "elements", elts);
   for (vsize i = elts.size (); i--;)
-    if (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;