Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / hara-kiri-group-spanner.cc

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 4c9cc03963eb0753f65a39af9c3a0e5942be7129..90a06f145a9a0b0e7a05d0facf124d689792c2aa 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -14,7 +14,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
@@ -78,11 +77,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_iv ();
+         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);
@@ -153,7 +152,7 @@ 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",
+ADD_INTERFACE (Hara_kiri_group_spanner,
               "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.",