X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=22975589cbe2df8aad1482ac6f0da63da81c4b1e;hb=1e63e1c8345be830cf76cda3d0c0d91b65a1f3c6;hp=b5071cc8155e3a64429bc6f3a2a6fe6bd70b08f8;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index b5071cc815..22975589cb 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,107 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 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 "axis-group-interface.hh"
 #include "spanner.hh"
-#include "hara-kiri-group-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, 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)
 {
-  Spanner*sp = dynamic_cast<Spanner*> (me);
-  SCM worth = me->get_grob_property ("items-worth-living");
-  if (gh_pair_p (worth))
-    return ;
+  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_grob_property ("remove-first"))
+  if (!to_boolean (me->get_property ("remove-first"))
       && broken_spanner_index (sp) == 0)
     {
-      return ;
+      return;
     }
-  
+
   Link_array<Grob> childs = Axis_group_interface::get_children (me);
   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_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_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->get_parent (a)->self_scm (), axis);
-  return gh_double2scm (0.0);
+  return scm_make_real (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::add_interesting_item (Grob* me,Grob* n)
+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);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("items-worth-living"), n);
 }
 
-
-ADD_INTERFACE (Hara_kiri_group_spanner,"hara-kiri-group-interface",
-  "  As Vertical_group_spanner, but keep track of interesting items.  If	\
-we don't contain any interesting items after linebreaking, then			\
-gracefully commit suicide.  Objective: don't disgrace Lily by			\
-typesetting empty lines in orchestral scores.",					\
-  "items-worth-living remove-first");
+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");