X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=395bcdb553931e0db85b9b0ca7266318e5d09b0a;hb=12b56b962fe81a56997a6c5fca448fd71a4ec0bb;hp=4c9cc03963eb0753f65a39af9c3a0e5942be7129;hpb=2893f2dd20c081c06c1c7356551344801f8a233a;p=lilypond.git

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 4c9cc03963..395bcdb553 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -1,10 +1,21 @@
 /*
-  hara-kiri-vertical-group-spanner.cc -- implement Hara_kiri_group_spanner
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  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 "hara-kiri-group-spanner.hh"
@@ -14,7 +25,6 @@
 #include "axis-group-interface.hh"
 #include "spanner.hh"
 #include "warn.hh"
-#include "item.hh"
 
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 1);
 SCM
@@ -25,6 +35,15 @@ Hara_kiri_group_spanner::y_extent (SCM smob)
   return Axis_group_interface::generic_group_extent (me, Y_AXIS);
 }
 
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, calc_skylines, 1);
+SCM
+Hara_kiri_group_spanner::calc_skylines (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  consider_suicide (me);
+  return Axis_group_interface::calc_skylines (smob);
+}
+
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, pure_height, 3);
 SCM
 Hara_kiri_group_spanner::pure_height (SCM smob, SCM start_scm, SCM end_scm)
@@ -35,7 +54,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
@@ -78,11 +98,11 @@ Hara_kiri_group_spanner::request_suicide (Grob *me, int start, int end)
 
       for (vsize i = 0; i < worth.size (); i++)
 	{
-	  Item *it = dynamic_cast<Item*> (worth[i]);
-	  if (it)
-	    ranks.push_back (Paper_column::get_rank (it->get_column ()));
+	  Interval_t<int> iv = worth[i]->spanned_rank_interval ();
+	  for (int j = iv[LEFT]; j <= iv[RIGHT]; j++)
+	    ranks.push_back (j);
 	}
-      vector_sort (ranks, default_compare);
+      vector_sort (ranks, less<int> ());
       uniq (ranks);
 
       SCM scm_vec = scm_c_make_vector (ranks.size (), SCM_EOL);
@@ -120,15 +140,6 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me)
   We can't rely on offsets and dimensions of elements in a hara-kiri
   group. Use a callback to make sure that hara-kiri has been done
   before asking for offsets.  */
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, after_line_breaking, 1);
-SCM
-Hara_kiri_group_spanner::after_line_breaking (SCM smob)
-{
-  Grob *me = unsmob_grob (smob);
-  consider_suicide (me);
-  return SCM_UNSPECIFIED;
-}
-
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 1);
 SCM
 Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob)
@@ -153,11 +164,10 @@ Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
   Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("items-worth-living"), n);
 }
 
-ADD_INTERFACE (Hara_kiri_group_spanner, "hara-kiri-group-interface",
-	       "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.",
-
+ADD_INTERFACE (Hara_kiri_group_spanner,
+	       "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 "