Guile-1.9 compatibility fixes.

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

diff --git a/lily/staff-grouper-interface.cc b/lily/staff-grouper-interface.cc
index 70cb4bb4a87b62d6648a1fb3beee83225e888112..ec204fbf9bc70bda428f74427498b02b647951b9 100644 (file)
--- a/lily/staff-grouper-interface.cc
+++ b/lily/staff-grouper-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2009 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2009--2011 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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;
@@ -36,7 +40,7 @@ ADD_INTERFACE (Staff_grouper_interface,
               "A grob that collects staves together.",
 
               /* properties */
-              "between-staff-spacing "
-              "after-last-staff-spacing "
+              "staff-staff-spacing "
+              "staffgroup-staff-spacing "
               );