X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=28043337ff6e5b79665b1946144f703eeeea4069;hb=c98b4dc03abd0e96c0303f7e3b250c5f244a1208;hp=53166be9e5927824442ca23aba487bb0daaa6e2b;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 53166be9e5..28043337ff 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,101 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "hara-kiri-group-spanner.hh"
+
+#include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "spanner.hh"
-#include "hara-kiri-group-spanner.hh"
-#include "debug.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, 2);
 SCM
 Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (scm_axis);
+  (void) scm_axis;
 
-  assert (a == Y_AXIS);
+  assert (scm_to_int (scm_axis) == Y_AXIS);
   consider_suicide (me);
-  return  Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis);
+  return Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis);
 }
 
-
 void
-Hara_kiri_group_spanner::consider_suicide(Grob*me)
+Hara_kiri_group_spanner::consider_suicide (Grob *me)
 {
-  SCM worth = me->get_grob_property ("items-worth-living");
-  if (gh_pair_p (worth))
-    return ;
+  Spanner *sp = dynamic_cast<Spanner *> (me);
 
-  Link_array<Grob> childs = Axis_group_interface::get_children (me);
+  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;
+
+  Link_array<Grob> childs;
+  Axis_group_interface::get_children (me, &childs);
   for (int i = 0; i < childs.size (); i++)
     childs[i]->suicide ();
 
-
   /*
     very appropriate name here :-)
-   */
+  */
   me->suicide ();
 }
 
-
-
 /*
   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, force_hara_kiri_callback, 2);
 SCM
 Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
-  assert (a == Y_AXIS);
+  (void) axis;
+
+  assert (scm_to_int (axis) == Y_AXIS);
   consider_suicide (me);
-  return gh_double2scm (0.0);
+  return scm_from_double (0.0);
 }
 
-
-MAKE_SCHEME_CALLBACK(Hara_kiri_group_spanner,force_hara_kiri_in_parent_callback,2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_parent_callback, 2);
 SCM
 Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, SCM axis)
 {
   Grob *daughter = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
-  force_hara_kiri_callback (daughter->parent_l (a)->self_scm (), axis);
-  return gh_double2scm ( 0.0);
+  force_hara_kiri_callback (daughter->get_parent (a)->self_scm (), axis);
+  return scm_from_double (0.0);
 }
 
 void
-Hara_kiri_group_spanner::add_element (Grob * me, Grob *e)
+Hara_kiri_group_spanner::add_element (Grob *me, Grob *e)
 {
   //  e->add_offset_callback (force_hara_kiri_in_parent_callback, Y_AXIS);
   Axis_group_interface::add_element (me, e);
 }
 
-
 void
-Hara_kiri_group_spanner::set_interface (Grob*me)
+Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
 {
-  me->set_interface (ly_symbol2scm ("hara-kiri-group-interface"));
+  me->add_dependency (n);
+  Pointer_group_interface::add_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.",
+	       "items-worth-living remove-first");
 
-bool
-Hara_kiri_group_spanner::has_interface (Grob*me)
-{
-  return me->has_interface (ly_symbol2scm ("hara-kiri-group-interface"));
-}
-
-void 
-Hara_kiri_group_spanner::add_interesting_item (Grob* me,Grob* n)
-{
-  me->add_dependency (n);
-  Pointer_group_interface::add_element (me, "items-worth-living",n);
-}