Merge branch 'instrumentName-groups'

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

diff --git a/lily/staff-grouper-interface.cc b/lily/staff-grouper-interface.cc
index 0eae7e531fbb36738e62a8c46910745a66e68fac..ec204fbf9bc70bda428f74427498b02b647951b9 100644 (file)
--- a/lily/staff-grouper-interface.cc
+++ b/lily/staff-grouper-interface.cc
@@ -1,21 +1,36 @@
 /*
-  staff-grouper-interface.cc -- implement Staff_grouper_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2009--2011 Joe Neeman <joeneeman@gmail.com>
 
-  (c) 2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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;
@@ -25,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 "
               );