X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=3a686dfcf03974481f0f4ccb174c83544b8dad6e;hb=c043944a17dce34b2e539982e7e43b6cbc74b632;hp=0fad67b533b96beed735f7a1c9dd231cff28213b;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 0fad67b533..3a686dfcf0 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,48 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "hara-kiri-group-spanner.hh"
 
+#include "paper-column.hh"
 #include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "spanner.hh"
 #include "warn.hh"
 #include "item.hh"
 
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 1);
 SCM
-Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis)
+Hara_kiri_group_spanner::y_extent (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
-  (void) scm_axis;
-
-  assert (scm_to_int (scm_axis) == Y_AXIS);
+  Grob *me = unsmob_grob (smob);
   consider_suicide (me);
-  return Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis);
+  return Axis_group_interface::generic_group_extent (me, Y_AXIS);
 }
 
 void
 Hara_kiri_group_spanner::consider_suicide (Grob *me)
 {
   Spanner *sp = dynamic_cast<Spanner *> (me);
+  if (!to_boolean (me->get_property ("remove-empty")))
+    return ;
 
-  extract_grob_set (me,"items-worth-living", worth);
+  extract_grob_set (me, "items-worth-living", worth);
   if (worth.size ())
     return;
 
-  if (!to_boolean (me->get_property ("remove-first"))
-      && broken_spanner_index (sp) == 0)
-    {
-      return;
-    }
+  bool remove_first = to_boolean (me->get_property ("remove-first"));
+  if (!remove_first
+       && ((sp->original () && broken_spanner_index (sp) == 0)
+	   || Paper_column::get_rank (sp->get_bound (LEFT)->get_column ())
+	   == 0)) 
+    return;
 
-  Link_array<Grob> childs;
+  vector<Grob*> childs;
   Axis_group_interface::get_children (me, &childs);
-  for (int i = 0; i < childs.size (); i++)
+  for (vsize i = 0; i < childs.size (); i++)
     childs[i]->suicide ();
 
   /*
@@ -57,40 +58,36 @@ 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, force_hara_kiri_callback, 2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, after_line_breaking, 1);
 SCM
-Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
+Hara_kiri_group_spanner::after_line_breaking (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
-  (void) axis;
-  
-  assert (scm_to_int (axis) == Y_AXIS);
+  Grob *me = unsmob_grob (smob);
   consider_suicide (me);
-  return scm_from_double (0.0);
+  return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_parent_callback, 2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 1);
 SCM
-Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, SCM axis)
+Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob)
 {
-  Grob *daughter = unsmob_grob (element_smob);
-  Axis a = (Axis) scm_to_int (axis);
-  assert (a == Y_AXIS);
-  force_hara_kiri_callback (daughter->get_parent (a)->self_scm (), axis);
+  Grob *me = unsmob_grob (smob);
+  consider_suicide (me);
   return scm_from_double (0.0);
 }
 
-void
-Hara_kiri_group_spanner::add_element (Grob *me, Grob *e)
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_y_parent_callback, 1);
+SCM
+Hara_kiri_group_spanner::force_hara_kiri_in_y_parent_callback (SCM smob)
 {
-  //  e->add_offset_callback (force_hara_kiri_in_parent_callback, Y_AXIS);
-  Axis_group_interface::add_element (me, e);
+  Grob *daughter = unsmob_grob (smob);
+  force_hara_kiri_callback (daughter->get_parent (Y_AXIS)->self_scm ());
+  return scm_from_double (0.0);
 }
 
 void
 Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
 {
-  me->add_dependency (n);
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("items-worth-living"), n);
 }
 
@@ -98,5 +95,12 @@ 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.",
-	       "items-worth-living remove-first");
+
+
+	       /* properties */
+	       "items-worth-living "
+	       "remove-empty "
+	       "remove-first "
+	       );
+