X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=f477cd22e4cad5be5db83b3c701f99125d874410;hb=4f5b668a1d61ca95adb60d56f1c771748b5a6446;hp=3c75ae45a3d22260f971ee4153fd305eabd8e7c0;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 3c75ae45a3..f477cd22e4 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #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_element (element_smob);
-  Axis a = (Axis) gh_scm2int (scm_axis);
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) scm_to_int (scm_axis);
 
   assert (a == Y_AXIS);
   consider_suicide (me);
@@ -28,12 +28,19 @@ Hara_kiri_group_spanner::y_extent (SCM element_smob, 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))
+  Spanner*sp = dynamic_cast<Spanner*> (me);
+  SCM worth = me->get_property ("items-worth-living");
+  if (scm_is_pair (worth))
     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);
   for (int i = 0; i < childs.size (); i++)
     childs[i]->suicide ();
@@ -51,27 +58,27 @@ 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,force_hara_kiri_callback,2);
 SCM
 Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
 {
-  Grob *me = unsmob_element (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
   consider_suicide (me);
-  return gh_double2scm (0.0);
+  return scm_make_real (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_element (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Grob *daughter = unsmob_grob (element_smob);
+  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_make_real (0.0);
 }
 
 void
@@ -82,22 +89,21 @@ Hara_kiri_group_spanner::add_element (Grob * me, Grob *e)
 }
 
 
-void
-Hara_kiri_group_spanner::set_interface (Grob*me)
-{
-  me->set_interface (ly_symbol2scm ("hara-kiri-group-interface"));
-}
 
 
-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);
+  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");
+